azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce Property: Fix primary occurrence replacement

Browse Source 
#KT-7610 Fixed
This commit is contained in:
Alexey Sedunov
2015-05-11 16:35:21 +03:00
parent 339383b5b1
commit ca54fe0883
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt
+10
View File
@@ -22,6 +22,9 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Pass import com.intellij.openapi.util.Pass
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiReference
import com.intellij.psi.search.SearchScope
import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer
import com.intellij.ui.NonFocusableCheckBox import com.intellij.ui.NonFocusableCheckBox
import com.intellij.ui.PopupMenuListenerAdapter import com.intellij.ui.PopupMenuListenerAdapter
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionResult import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionResult
@@ -30,6 +33,9 @@ import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.generate
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.processDuplicatesSilently import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.processDuplicatesSilently
import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinInplaceVariableIntroducer import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinInplaceVariableIntroducer
import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinInplaceVariableIntroducer.ControlWrapper import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinInplaceVariableIntroducer.ControlWrapper
import org.jetbrains.kotlin.idea.search.usagesSearch.DefaultSearchHelper
import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchTarget
import org.jetbrains.kotlin.idea.search.usagesSearch.search
import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.psi.JetClassOrObject
import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetExpression
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
@@ -161,6 +167,10 @@ public class KotlinInplacePropertyIntroducer(
return myElementToRename.parents().first { it is JetClassOrObject || it is JetFile } return myElementToRename.parents().first { it is JetClassOrObject || it is JetFile }
} }
override fun collectRefs(referencesSearchScope: SearchScope): MutableCollection<PsiReference>? {
return DefaultSearchHelper<JetProperty>().newRequest(UsagesSearchTarget(property, referencesSearchScope)).search().toArrayList()
}
override fun moveOffsetAfter(success: Boolean) { override fun moveOffsetAfter(success: Boolean) {
super.moveOffsetAfter(success) super.moveOffsetAfter(success)
if (success && replaceAll) { if (success && replaceAll) {