From 256791cf026c9371a4559853d7ca50081b5510f4 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 2 Sep 2015 16:22:14 +0200
Subject: [PATCH] fix search for usages of Java overrides

---
 .../KotlinReferencesSearcher.kt               | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 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 1cdcb035f11..75a38a878d4 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
@@ -76,7 +76,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
 
         val kotlinOptions = (queryParameters as? KotlinReferencesSearchParameters)?.kotlinOptions
                             ?: KotlinReferencesSearchOptions.Empty
-        val resultProcessor = MyRequestResultProcessor(unwrappedElement, refFilter, kotlinOptions)
+        val resultProcessor = MyRequestResultProcessor(unwrappedElement, filter = refFilter, options = kotlinOptions)
 
         if (kotlinOptions.anyEnabled()) {
             val name = unwrappedElement.name
@@ -115,7 +115,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
             namedArgsScope = GlobalSearchScope.filesScope(project, filesWithFunctionName.asList())
         }
 
-        val processor = MyRequestResultProcessor(parameter, { it.isNamedArgumentReference() }, KotlinReferencesSearchOptions.Empty)
+        val processor = MyRequestResultProcessor(parameter, filter = { it.isNamedArgumentReference() })
         queryParameters.optimizer.searchWord(parameterName,
                                              namedArgsScope,
                                              KOTLIN_NAMED_ARGUMENT_SEARCH_CONTEXT,
@@ -130,8 +130,9 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
 
     private class MyRequestResultProcessor(
             private val unwrappedElement: PsiElement,
-            private val filter: (PsiReference) -> Boolean,
-            private val options: KotlinReferencesSearchOptions
+            private val originalElement: PsiElement = unwrappedElement,
+            private val filter: (PsiReference) -> Boolean = { true },
+            private val options: KotlinReferencesSearchOptions = KotlinReferencesSearchOptions.Empty
     ) : RequestResultProcessor() {
         private val referenceService = PsiReferenceService.getService()
 
@@ -152,14 +153,14 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
             if (isReferenceTo(element)) {
                 return true
             }
-            if (element is JetNamedDeclaration) {
-                if (options.acceptCallableOverrides && isCallableOverrideUsage(element)) {
+            if (originalElement is JetNamedDeclaration) {
+                if (options.acceptCallableOverrides && isCallableOverrideUsage(originalElement)) {
                     return true
                 }
-                if (options.acceptOverloads && isUsageInContainingDeclaration(element)) {
+                if (options.acceptOverloads && isUsageInContainingDeclaration(originalElement)) {
                     return true
                 }
-                if (options.acceptExtensionsOfDeclarationClass && isExtensionOfDeclarationClassUsage(element)) {
+                if (options.acceptExtensionsOfDeclarationClass && isExtensionOfDeclarationClassUsage(originalElement)) {
                     return true
                 }
             }
@@ -278,8 +279,11 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
                 val context = UsageSearchContext.IN_CODE + UsageSearchContext.IN_FOREIGN_LANGUAGES + UsageSearchContext.IN_COMMENTS
                 val kotlinOptions = (queryParameters as? KotlinReferencesSearchParameters)?.kotlinOptions
                                     ?: KotlinReferencesSearchOptions.Empty
+                val resultProcessor = MyRequestResultProcessor(element,
+                                                               queryParameters.getElementToSearch().namedUnwrappedElement ?: element,
+                                                               options = kotlinOptions)
                 queryParameters.getOptimizer().searchWord(name, scope, context.toShort(), true, element,
-                                                          MyRequestResultProcessor(element, { true }, kotlinOptions))
+                                                          resultProcessor)
             }
         }
     }