More consistent presentation for different completion items producing lambda's

idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt

@@ -117,8 +117,8 @@ class LookupElementsCollector(
 
                                 val tails = presentation.getTailFragments()
                                 presentation.clearTail()
-                                presentation.appendTailText(" " + buildLambdaPresentation(parameterType), false)
-                                tails.drop(1)/*drop old function signature*/.forEach { presentation.appendTailText(it.text, it.isGrayed()) }
+                                presentation.appendTailText(" " + buildLambdaPresentation(parameterType) + " ", false)
+                                tails.forEach { presentation.appendTailText(it.text, true) }
                             }
 
                             override fun handleInsert(context: InsertionContext) {

idea/idea-completion/testData/basic/common/HigherOrderFunction1.kt

@@ -5,4 +5,4 @@ fun test() {
 }
 
 // EXIST: { lookupString:"foo", itemText: "foo", tailText: "(p: (String, Char) -> Unit) (<root>)", typeText:"Unit" }
-// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { String, Char -> ... } (<root>)", typeText:"Unit" }
+// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { String, Char -> ... } (p: (String, Char) -> Unit) (<root>)", typeText:"Unit" }

idea/idea-completion/testData/basic/common/HigherOrderFunction2.kt

@@ -5,4 +5,4 @@ fun test() {
 }
 
 // EXIST: { lookupString:"foo", itemText: "foo", tailText: "(p: (String, Char) -> Unit) for String in <root>", typeText:"Unit" }
-// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { String, Char -> ... } for String in <root>", typeText:"Unit" }
+// EXIST: { lookupString:"foo", itemText: "foo", tailText: " { String, Char -> ... } (p: (String, Char) -> Unit) for String in <root>", typeText:"Unit" }

idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt

@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"

idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt.after

@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"

idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt

@@ -6,5 +6,5 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
 

idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt.after

@@ -6,5 +6,5 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
 

idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt

@@ -5,5 +5,5 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: "foo"
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
 // CHAR: '\t'

idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt.after

@@ -5,5 +5,5 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: "foo"
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"
 // CHAR: '\t'

idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt

@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"

idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt.after

@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"

idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt

@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"

idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt.after

@@ -5,4 +5,4 @@ fun main(args: Array<String>) {
 }
 
 // ELEMENT: foo
-// TAIL_TEXT: " { String, Char -> ... } (<root>)"
+// TAIL_TEXT: " { String, Char -> ... } (p: (String, Char) -> Boolean) (<root>)"