From 59fe7444d1a243fe524a31b3c428e07cbcbbb794 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 31 Jan 2017 16:11:51 +0300
Subject: [PATCH] Rename/Find Usages: Disable text occurrence search for
 KtParameter

---
 .../findUsages/handlers/KotlinFindMemberUsagesHandler.kt | 2 +-
 .../refactoring/rename/RenameKotlinParameterProcessor.kt | 6 ------
 .../findParameterUsages/parameterNameInTextFile.0.kt     | 9 +++++++++
 .../findParameterUsages/parameterNameInTextFile.1.txt    | 1 +
 .../parameterNameInTextFile.results.txt                  | 1 +
 .../kotlin/findUsages/FindUsagesTestGenerated.java       | 6 ++++++
 6 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.0.kt
 create mode 100644 idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.1.txt
 create mode 100644 idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.results.txt

diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
index a8c38cb8441..03331c75bae 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
@@ -180,7 +180,7 @@ abstract class KotlinFindMemberUsagesHandler<T : KtNamedDeclaration>
                                              options: FindUsagesOptions,
                                              query: Query<PsiReference>): Query<PsiReference>
 
-    override fun isSearchForTextOccurencesAvailable(psiElement: PsiElement, isSingleFile: Boolean): Boolean = !isSingleFile
+    override fun isSearchForTextOccurencesAvailable(psiElement: PsiElement, isSingleFile: Boolean): Boolean = !isSingleFile && psiElement !is KtParameter
 
     override fun findReferencesToHighlight(target: PsiElement, searchScope: SearchScope): Collection<PsiReference> {
         val callableDescriptor = (target as? KtCallableDeclaration)?.resolveToDescriptorIfAny() as? CallableDescriptor
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt
index 9db69ac23a7..245def3719e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt
@@ -46,12 +46,6 @@ class RenameKotlinParameterProcessor : RenameKotlinPsiProcessor() {
         JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_VARIABLE = enabled
     }
 
-    override fun isToSearchForTextOccurrences(element: PsiElement) = JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_VARIABLE
-
-    override fun setToSearchForTextOccurrences(element: PsiElement, enabled: Boolean) {
-        JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_VARIABLE = enabled
-    }
-
     override fun findCollisions(
             element: PsiElement,
             newName: String?,
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.0.kt b/idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.0.kt
new file mode 100644
index 00000000000..719bf3dc1eb
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.0.kt
@@ -0,0 +1,9 @@
+// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
+// OPTIONS: usages
+fun foo(<caret>param: String) {
+
+}
+
+fun bar() {
+    foo(param = "")
+}
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.1.txt b/idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.1.txt
new file mode 100644
index 00000000000..437d02a512b
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.1.txt
@@ -0,0 +1 @@
+param
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.results.txt
new file mode 100644
index 00000000000..211248416f2
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.results.txt
@@ -0,0 +1 @@
+Named argument 8 foo(param = "")
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
index 427e3709698..8c81e564dcd 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
@@ -957,6 +957,12 @@ public class FindUsagesTestGenerated extends AbstractFindUsagesTest {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinHighlightParameterUsages.0.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("parameterNameInTextFile.0.kt")
+            public void testParameterNameInTextFile() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/parameterNameInTextFile.0.kt");
+                doTest(fileName);
+            }
         }
 
         @TestMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages")