diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt index 46e70fdec85..3a6385ae8d2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt @@ -22,6 +22,9 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.openapi.util.Pass 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.PopupMenuListenerAdapter 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.introduceVariable.KotlinInplaceVariableIntroducer 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.JetExpression import org.jetbrains.kotlin.psi.JetFile @@ -161,6 +167,10 @@ public class KotlinInplacePropertyIntroducer( return myElementToRename.parents().first { it is JetClassOrObject || it is JetFile } } + override fun collectRefs(referencesSearchScope: SearchScope): MutableCollection? { + return DefaultSearchHelper().newRequest(UsagesSearchTarget(property, referencesSearchScope)).search().toArrayList() + } + override fun moveOffsetAfter(success: Boolean) { super.moveOffsetAfter(success) if (success && replaceAll) {