From 474986587be6fb01e0bc68796a9a09bbd03ada1a Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Mon, 22 Mar 2021 09:13:00 +0000 Subject: [PATCH] Limit scope of change signature usage processor with useScopeOptimizer GitOrigin-RevId: ccb7e6bfa55c72a784e5147b3b3851d05f84041f --- .../changeSignature/KotlinChangeSignatureUsageProcessor.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt index 16c1b7405905..9d332853be3c 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt @@ -10,8 +10,8 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.Ref import com.intellij.psi.* import com.intellij.psi.codeStyle.JavaCodeStyleManager -import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.LocalSearchScope +import com.intellij.psi.search.PsiSearchHelper import com.intellij.psi.search.searches.MethodReferencesSearch import com.intellij.psi.search.searches.OverridingMethodsSearch import com.intellij.psi.search.searches.ReferencesSearch @@ -270,10 +270,12 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { } } + val searchScope = PsiSearchHelper.getInstance(functionPsi.project).getUseScope(functionPsi) + changeInfo.oldName?.let { oldName -> TextOccurrencesUtil.findNonCodeUsages( functionPsi, - GlobalSearchScope.projectScope(functionPsi.project), + searchScope, oldName, /* searchInStringsAndComments = */true, /* searchInNonJavaFiles = */true,