From b5ee84075ab1a9e170ab7351749bab5f391d9b47 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 6 Oct 2015 22:33:09 +0300
Subject: [PATCH] Do not show synthesized parameter names in Parameter Info

---
 .../KotlinFunctionParameterInfoHandler.kt      | 18 ++++++++++++------
 .../NoSynthesizedParameterNames.kt             | 10 ++++++++++
 .../ParameterInfoTestGenerated.java            |  6 ++++++
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 idea/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
index b9eff6f99a5..df4084513fd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
@@ -168,6 +168,8 @@ abstract class KotlinParameterInfoWithCallHandlerBase<TArgumentList : JetElement
                 usedParameterIndices.add(substitutedDescriptor.valueParameters.lastIndex)
             }
 
+            val includeParameterNames = !substitutedDescriptor.hasSynthesizedParameterNames()
+
             fun appendParameter(parameter: ValueParameterDescriptor) {
                 if (length() > 0) {
                     append(", ")
@@ -178,7 +180,7 @@ abstract class KotlinParameterInfoWithCallHandlerBase<TArgumentList : JetElement
                     boldStartOffset = length()
                 }
 
-                append(renderParameter(parameter, namedMode, project))
+                append(renderParameter(parameter, includeParameterNames, namedMode, project))
 
                 if (highlightParameter) {
                     boldEndOffset = length()
@@ -230,15 +232,19 @@ abstract class KotlinParameterInfoWithCallHandlerBase<TArgumentList : JetElement
     override fun getParametersForLookup(item: LookupElement, context: ParameterInfoContext) = emptyArray<Any>()
     override fun getParametersForDocumentation(item: FunctionDescriptor, context: ParameterInfoContext) = emptyArray<Any>()
 
-    protected fun renderParameter(parameter: ValueParameterDescriptor, named: Boolean, project: Project): String {
+    private fun renderParameter(parameter: ValueParameterDescriptor, includeName: Boolean, named: Boolean, project: Project): String {
         return StringBuilder {
             if (named) append("[")
 
             if (parameter.varargElementType != null) {
                 append("vararg ")
             }
-            append(parameter.name)
-            append(": ")
+
+            if (includeName) {
+                append(parameter.name)
+                append(": ")
+            }
+
             append(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(parameterTypeToRender(parameter)))
 
             if (parameter.hasDefaultValue()) {
@@ -279,7 +285,7 @@ abstract class KotlinParameterInfoWithCallHandlerBase<TArgumentList : JetElement
         return type
     }
 
-    protected fun isResolvedToDescriptor(
+    private fun isResolvedToDescriptor(
             call: Call,
             functionDescriptor: FunctionDescriptor,
             bindingContext: BindingContext
@@ -288,7 +294,7 @@ abstract class KotlinParameterInfoWithCallHandlerBase<TArgumentList : JetElement
         return target != null && descriptorsEqual(target, functionDescriptor)
     }
 
-    protected data class SignatureInfo(
+    private data class SignatureInfo(
             val substitutedDescriptor: FunctionDescriptor,
             val argumentToParameter: (ValueArgument) -> ValueParameterDescriptor?,
             val highlightParameterIndex: Int?,
diff --git a/idea/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt b/idea/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt
new file mode 100644
index 00000000000..6c0c8ebae91
--- /dev/null
+++ b/idea/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt
@@ -0,0 +1,10 @@
+import java.io.File
+
+val file = File(<caret>)
+
+/*
+Text: (<highlight>File!</highlight>, String!), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>String!</highlight>), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>String!</highlight>, String!), Disabled: false, Strikeout: false, Green: false
+Text: (<highlight>URI!</highlight>), Disabled: false, Strikeout: false, Green: false
+*/
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java
index 808bb2eea54..3b927422fc2 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java
@@ -160,6 +160,12 @@ public class ParameterInfoTestGenerated extends AbstractParameterInfoTest {
             doTest(fileName);
         }
 
+        @TestMetadata("NoSynthesizedParameterNames.kt")
+        public void testNoSynthesizedParameterNames() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("NotAccessible.kt")
         public void testNotAccessible() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NotAccessible.kt");