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

Rename: Restore project scope (fixing failing tests)

Browse Source 
It fixes search of usages for some cases where element's useScope()
is not enough (like parameter references in named arguments)
This commit is contained in:
Alexey Sedunov
2018-09-26 16:10:13 +03:00
parent 84d9f8250c
commit 174fd41564
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt
+3 -1
View File
@@ -35,6 +35,8 @@ import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.references.KtReference
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters 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.actualsForExpected
import org.jetbrains.kotlin.idea.util.liftToExpected import org.jetbrains.kotlin.idea.util.liftToExpected
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
@@ -67,7 +69,7 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() {
override fun findReferences(element: PsiElement): Collection<PsiReference> { override fun findReferences(element: PsiElement): Collection<PsiReference> {
val searchParameters = KotlinReferencesSearchParameters( val searchParameters = KotlinReferencesSearchParameters(
element, element,
element.useScope, element.project.projectScope() or element.useScope,
kotlinOptions = KotlinReferencesSearchOptions(searchForComponentConventions = false) kotlinOptions = KotlinReferencesSearchOptions(searchForComponentConventions = false)
) )
val references = ReferencesSearch.search(searchParameters).toMutableList() val references = ReferencesSearch.search(searchParameters).toMutableList()
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt.173
+4 -3
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.asJava.toLightMethods
import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.asJava.unwrapped
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchParameters 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.search.projectScope
import org.jetbrains.kotlin.idea.util.actualsForExpected import org.jetbrains.kotlin.idea.util.actualsForExpected
import org.jetbrains.kotlin.idea.util.liftToExpected import org.jetbrains.kotlin.idea.util.liftToExpected
@@ -46,9 +47,9 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() {
override fun findReferences(element: PsiElement): Collection<PsiReference> { override fun findReferences(element: PsiElement): Collection<PsiReference> {
val searchParameters = KotlinReferencesSearchParameters( val searchParameters = KotlinReferencesSearchParameters(
element, element,
element.useScope, element.project.projectScope() or element.useScope,
kotlinOptions = KotlinReferencesSearchOptions(searchForComponentConventions = false) kotlinOptions = KotlinReferencesSearchOptions(searchForComponentConventions = false)
) )
val references = ReferencesSearch.search(searchParameters).toMutableList() val references = ReferencesSearch.search(searchParameters).toMutableList()
if (element is KtNamedFunction if (element is KtNamedFunction