From 174fd41564cfb8c106d63f27d6416697d71fe284 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 26 Sep 2018 16:10:13 +0300 Subject: [PATCH] Rename: Restore project scope (fixing failing tests) It fixes search of usages for some cases where element's useScope() is not enough (like parameter references in named arguments) --- .../idea/refactoring/rename/RenameKotlinPsiProcessor.kt | 4 +++- .../refactoring/rename/RenameKotlinPsiProcessor.kt.173 | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt index 8456f6e7897..d3b35c9b03b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt @@ -35,6 +35,8 @@ import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters +import org.jetbrains.kotlin.idea.search.or +import org.jetbrains.kotlin.idea.search.projectScope import org.jetbrains.kotlin.idea.util.actualsForExpected import org.jetbrains.kotlin.idea.util.liftToExpected import org.jetbrains.kotlin.name.Name @@ -67,7 +69,7 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() { override fun findReferences(element: PsiElement): Collection { val searchParameters = KotlinReferencesSearchParameters( element, - element.useScope, + element.project.projectScope() or element.useScope, kotlinOptions = KotlinReferencesSearchOptions(searchForComponentConventions = false) ) val references = ReferencesSearch.search(searchParameters).toMutableList() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 index f3036691a40..f9d7ffaffa2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173 @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.asJava.toLightMethods import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters +import org.jetbrains.kotlin.idea.search.or import org.jetbrains.kotlin.idea.search.projectScope import org.jetbrains.kotlin.idea.util.actualsForExpected import org.jetbrains.kotlin.idea.util.liftToExpected @@ -46,9 +47,9 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() { override fun findReferences(element: PsiElement): Collection { val searchParameters = KotlinReferencesSearchParameters( - element, - element.useScope, - kotlinOptions = KotlinReferencesSearchOptions(searchForComponentConventions = false) + element, + element.project.projectScope() or element.useScope, + kotlinOptions = KotlinReferencesSearchOptions(searchForComponentConventions = false) ) val references = ReferencesSearch.search(searchParameters).toMutableList() if (element is KtNamedFunction