From c2c6ba59fdd9f146d566e40e35de2061ab532126 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 31 Jul 2015 21:46:03 +0300
Subject: [PATCH] Changes on code review

---
 .../jetbrains/kotlin/parsing/AbstractJetParsingTest.java | 2 +-
 .../search/ideaExtensions/KotlinReferencesSearcher.kt    | 9 +++++++--
 .../kotlin/idea/search/usagesSearch/searchHelpers.kt     | 4 ++--
 .../kotlinFunctionParameterUsages.0.kt                   | 8 ++++++++
 .../kotlinFunctionParameterUsages.results.txt            | 2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
index 569754d205a..ebcd9ad71b6 100644
--- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
@@ -62,7 +62,7 @@ public abstract class AbstractJetParsingTest extends ParsingTestCase {
             if (!methodName.startsWith("get") && !methodName.startsWith("find") ||
                 methodName.equals("getReference") ||
                 methodName.equals("getReferences") ||
-                methodName.startsWith("getUseScope") ||
+                methodName.equals("getUseScope") ||
                 methodName.equals("getPresentation")) {
                 continue;
             }
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 d91ec10f696..fd6bdecfc14 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
@@ -49,10 +49,15 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
 
         val effectiveSearchScope = runReadAction { queryParameters.effectiveSearchScope }
 
+        val refFilter: (PsiReference) -> Boolean = if (unwrappedElement is JetParameter)
+            ({ ref: PsiReference -> !ref.isNamedArgumentReference()/* they are processed later*/ })
+        else
+            ({true})
+
         words.forEach { word ->
             queryParameters.optimizer.searchWord(word, effectiveSearchScope,
                                                  UsagesSearchLocation.EVERYWHERE.searchContext, true, unwrappedElement,
-                                                 MyRequestResultProcessor(unwrappedElement) { !it.isNamedArgumentReference()/* they are processed later*/ })
+                                                 MyRequestResultProcessor(unwrappedElement, refFilter))
         }
 
         if (unwrappedElement is JetParameter) {
@@ -71,7 +76,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
         var namedArgsScope = function.useScope.intersectWith(queryParameters.scopeDeterminedByUser)
 
         if (namedArgsScope is GlobalSearchScope) {
-            namedArgsScope = JetSourceFilterScope.kotlinSources(namedArgsScope, project)
+            namedArgsScope = JetSourceFilterScope.kotlinSourcesAndLibraries(namedArgsScope, project)
 
             val filesWithFunctionName = CacheManager.SERVICE.getInstance(project).getVirtualFilesWithWord(
                     function.name!!, UsageSearchContext.IN_CODE, namedArgsScope, true)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
index a71d5ada07a..933005c94a1 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
@@ -268,14 +268,14 @@ class PropertyUsagesSearchHelper(
 
             var scope = function.useScope and target.effectiveScope
             if (scope is GlobalSearchScope) {
-                scope = JetSourceFilterScope.kotlinSources(scope, element.project)
+                scope = JetSourceFilterScope.kotlinSourcesAndLibraries(scope, element.project)
             }
 
             val additionalFilter1 = AdditionalFileFilter(element.name!!, KOTLIN_NAMED_ARGUMENT_SEARCH_CONTEXT, true)
             val additionalFilter2 = AdditionalFileFilter(function.name!!, UsageSearchContext.IN_CODE, true)
             val namedArgsRequest = UsagesSearchRequestItem(target.withScope(scope),
                                                            listOf(element.name!!),
-                                                           (PsiReference::isNamedArgumentUsage).searchFilter,
+                                                           (PsiReference::isNamedArgumentUsage).searchFilter and makeFilter(target),
                                                            additionalFileFilters = listOf(additionalFilter1, additionalFilter2))
             return listOf(realUsagesRequest, namedArgsRequest)
         }
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt
index cf8fe9d8b2e..e64b7def8f8 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt
@@ -5,6 +5,14 @@ fun foo<T>(<caret>t: T): T {
     return t
 }
 
+fun bar(t: String) {
+    print(t)
+}
+
 fun usage() {
     foo(t = ":)")
+}
+
+fun falseUsage() {
+    bar(t = "")
 }
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt
index 3abb86a24ab..7301bbdbeee 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt
@@ -1,3 +1,3 @@
-Named argument (9: 9) foo(t = ":)")
+Named argument (13: 9) foo(t = ":)")
 Value read (4: 13) println(t)
 Value read (5: 12) return t
\ No newline at end of file