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

Fix effective search scope for find references

Browse Source 
Relates to #KT-18619
This commit is contained in:
Vladimir Dolzhenko
2020-03-21 22:55:00 +01:00
parent 6ce8d661ad
commit f82e2db65d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
+5 -5
View File
@@ -70,15 +70,15 @@ data class KotlinReferencesSearchOptions(
val Empty = KotlinReferencesSearchOptions() val Empty = KotlinReferencesSearchOptions()
internal fun calculateEffectiveScope( internal fun calculateEffectiveScope(
unwrappedElement: PsiNamedElement, elementToSearch: PsiNamedElement,
parameters: ReferencesSearch.SearchParameters parameters: ReferencesSearch.SearchParameters
): SearchScope { ): SearchScope {
val kotlinOptions = (parameters as? KotlinReferencesSearchParameters)?.kotlinOptions ?: Empty val kotlinOptions = (parameters as? KotlinReferencesSearchParameters)?.kotlinOptions ?: Empty
val elements = if (unwrappedElement is KtDeclaration && !isOnlyKotlinSearch(parameters.scopeDeterminedByUser)) { val elements = if (elementToSearch is KtDeclaration && !isOnlyKotlinSearch(parameters.scopeDeterminedByUser)) {
unwrappedElement.toLightElements().filterDataClassComponentsIfDisabled(kotlinOptions).nullize() elementToSearch.toLightElements().filterDataClassComponentsIfDisabled(kotlinOptions).nullize()
} else { } else {
null null
} ?: listOf(unwrappedElement) } ?: listOf(elementToSearch)
return elements.fold(parameters.effectiveSearchScope) { scope, e -> return elements.fold(parameters.effectiveSearchScope) { scope, e ->
scope.unionSafe(parameters.effectiveSearchScope(e)) scope.unionSafe(parameters.effectiveSearchScope(e))
@@ -163,7 +163,7 @@ class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, ReferencesSearc
null null
} ?: unwrappedElement } ?: unwrappedElement
val effectiveSearchScope = calculateEffectiveScope(unwrappedElement, queryParameters) val effectiveSearchScope = calculateEffectiveScope(elementToSearch, queryParameters)
val refFilter: (PsiReference) -> Boolean = when (elementToSearch) { val refFilter: (PsiReference) -> Boolean = when (elementToSearch) {
is KtParameter -> ({ ref: PsiReference -> !ref.isNamedArgumentReference()/* they are processed later*/ }) is KtParameter -> ({ ref: PsiReference -> !ref.isNamedArgumentReference()/* they are processed later*/ })