From f82e2db65dc8b68859c30c275a8eb7e291ca807d Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Sat, 21 Mar 2020 22:55:00 +0100
Subject: [PATCH] Fix effective search scope for find references

Relates to #KT-18619
---
 .../search/ideaExtensions/KotlinReferencesSearcher.kt  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
index 29e79f6e135..74da14e67aa 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
@@ -70,15 +70,15 @@ data class KotlinReferencesSearchOptions(
         val Empty = KotlinReferencesSearchOptions()
 
         internal fun calculateEffectiveScope(
-            unwrappedElement: PsiNamedElement,
+            elementToSearch: PsiNamedElement,
             parameters: ReferencesSearch.SearchParameters
         ): SearchScope {
             val kotlinOptions = (parameters as? KotlinReferencesSearchParameters)?.kotlinOptions ?: Empty
-            val elements = if (unwrappedElement is KtDeclaration && !isOnlyKotlinSearch(parameters.scopeDeterminedByUser)) {
-                unwrappedElement.toLightElements().filterDataClassComponentsIfDisabled(kotlinOptions).nullize()
+            val elements = if (elementToSearch is KtDeclaration && !isOnlyKotlinSearch(parameters.scopeDeterminedByUser)) {
+                elementToSearch.toLightElements().filterDataClassComponentsIfDisabled(kotlinOptions).nullize()
             } else {
                 null
-            } ?: listOf(unwrappedElement)
+            } ?: listOf(elementToSearch)
 
             return elements.fold(parameters.effectiveSearchScope) { scope, e ->
                 scope.unionSafe(parameters.effectiveSearchScope(e))
@@ -163,7 +163,7 @@ class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, ReferencesSearc
                     null
                 } ?: unwrappedElement
 
-            val effectiveSearchScope = calculateEffectiveScope(unwrappedElement, queryParameters)
+            val effectiveSearchScope = calculateEffectiveScope(elementToSearch, queryParameters)
 
             val refFilter: (PsiReference) -> Boolean = when (elementToSearch) {
                 is KtParameter -> ({ ref: PsiReference -> !ref.isNamedArgumentReference()/* they are processed later*/ })