Completion should not generate deprecated lambda syntax

idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt

@@ -69,8 +69,7 @@ fun insertLambdaTemplate(context: InsertionContext, placeholderRange: TextRange,
 fun buildLambdaPresentation(lambdaType: JetType): String {
     val parameterTypes = functionParameterTypes(lambdaType)
     val parametersPresentation = parameterTypes.map { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) }.joinToString(", ")
-    fun wrap(s: String) = if (parameterTypes.size() != 1) "($s)" else s
+    return "{ $parametersPresentation -> ... }"
-    return "{ ${wrap(parametersPresentation)} -> ... }"
 }
 
 private fun needExplicitParameterTypes(context: InsertionContext, placeholderRange: TextRange, lambdaType: JetType): Boolean {
@@ -92,17 +91,12 @@ private fun needExplicitParameterTypes(context: InsertionContext, placeholderRan
 private fun buildTemplate(lambdaType: JetType, explicitParameterTypes: Boolean, project: Project): Template {
     val parameterTypes = functionParameterTypes(lambdaType)
 
-    val useParenthesis = explicitParameterTypes || parameterTypes.size() != 1
-
     val manager = TemplateManager.getInstance(project)
 
     val template = manager.createTemplate("", "")
     template.setToShortenLongNames(true)
     //template.setToReformat(true) //TODO
     template.addTextSegment("{ ")
-    if (useParenthesis) {
-        template.addTextSegment("(")
-    }
 
     for ((i, parameterType) in parameterTypes.withIndex()) {
         if (i > 0) {
@@ -115,9 +109,6 @@ private fun buildTemplate(lambdaType: JetType, explicitParameterTypes: Boolean,
         }
     }
 
-    if (useParenthesis) {
-        template.addTextSegment(")")
-    }
     template.addTextSegment(" -> ")
     template.addEndVariable()
     template.addTextSegment(" }")

idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/LambdaItems.kt

@@ -29,8 +29,8 @@ object LambdaItems {
     public fun addToCollection(collection: MutableCollection<LookupElement>, functionExpectedInfos: Collection<ExpectedInfo>) {
         val distinctTypes = functionExpectedInfos.map { it.type }.toSet()
 
-        val singleType = if (distinctTypes.size == 1) distinctTypes.single() else null
+        val singleType = if (distinctTypes.size() == 1) distinctTypes.single() else null
-        val singleSignatureLength = singleType?.let { KotlinBuiltIns.getParameterTypeProjectionsFromFunctionType(it).size }
+        val singleSignatureLength = singleType?.let { KotlinBuiltIns.getParameterTypeProjectionsFromFunctionType(it).size() }
         val offerNoParametersLambda = singleSignatureLength == 0 || singleSignatureLength == 1
         if (offerNoParametersLambda) {
             val lookupElement = LookupElementBuilder.create("{...}")
@@ -49,7 +49,7 @@ object LambdaItems {
                                                val offset = context.getStartOffset()
                                                val placeholder = "{}"
                                                context.getDocument().replaceString(offset, context.getTailOffset(), placeholder)
-                                               insertLambdaTemplate(context, TextRange(offset, offset + placeholder.length), functionType)
+                                               insertLambdaTemplate(context, TextRange(offset, offset + placeholder.length()), functionType)
                                            })
                         .suppressAutoInsertion()
                         .assignSmartCompletionPriority(SmartCompletionItemPriority.LAMBDA)

idea/testData/completion/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 -> ... } (<root>)", typeText:"Unit" }

idea/testData/completion/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 -> ... } for String in <root>", typeText:"Unit" }

idea/testData/completion/handlers/HigherOrderFunctionWithArgs1.kt.after

@@ -1,5 +1,5 @@
 fun foo(p : (String, Char) -> Boolean){}
 
 fun main(args: Array<String>) {
-    foo { (s, c) -> <caret> }
+    foo { s, c -> <caret> }
 }

idea/testData/completion/handlers/HigherOrderFunctionWithArgs3.kt.after

@@ -2,5 +2,5 @@ fun foo(p : (String, Char) -> Boolean){}
 fun foo(p : (String, Boolean) -> Boolean){}
 
 fun main(args: Array<String>) {
-    foo { (s: String, c: Char) -> <caret> }
+    foo { s: String, c: Char -> <caret> }
 }

idea/testData/completion/handlers/smart/Lambda4.kt

@@ -5,4 +5,4 @@ fun bar() {
     foo(<caret>)
 }
 
-// ELEMENT: "{ (String, StringBuilder) -> ... }"
+// ELEMENT: "{ String, StringBuilder -> ... }"

idea/testData/completion/handlers/smart/Lambda4.kt.after

@@ -2,7 +2,7 @@ fun foo(p: (String, StringBuilder) -> Unit){}
 fun foo(p: (String) -> Unit){}
 
 fun bar() {
-    foo({ (s, stringBuilder) -> <caret> })
+    foo({ s, stringBuilder -> <caret> })
 }
 
-// ELEMENT: "{ (String, StringBuilder) -> ... }"
+// ELEMENT: "{ String, StringBuilder -> ... }"

idea/testData/completion/handlers/smart/Lambda5.kt

@@ -5,4 +5,4 @@ fun bar() {
     foo(<caret>)
 }
 
-// ELEMENT: "{ (String, StringBuilder) -> ... }"
+// ELEMENT: "{ String, StringBuilder -> ... }"

idea/testData/completion/handlers/smart/Lambda5.kt.after

@@ -2,7 +2,7 @@ fun foo(p: (String, StringBuilder) -> Unit){}
 fun foo(p: (Int, Char) -> Unit){}
 
 fun bar() {
-    foo({ (s: String, stringBuilder: StringBuilder) -> <caret> })
+    foo({ s: String, stringBuilder: StringBuilder -> <caret> })
 }
 
-// ELEMENT: "{ (String, StringBuilder) -> ... }"
+// ELEMENT: "{ String, StringBuilder -> ... }"

idea/testData/completion/handlers/smart/Lambda6.kt.todo

@@ -4,4 +4,4 @@ fun bar() {
     foo(<caret>)
 }
 
-// ELEMENT: "{ (String, String, String) -> ... }"
+// ELEMENT: "{ String, String, String -> ... }"

idea/testData/completion/handlers/smart/LambdaInsertImport.kt.after

@@ -4,7 +4,7 @@ fun foo(p: (java.util.Date) -> Unit){}
 fun foo(p: (String) -> Unit){}
 
 fun bar() {
-    foo({ (date: Date) -> <caret> })
+    foo({ date: Date -> <caret> })
 }
 
 // ELEMENT: "{ Date -> ... }"

idea/testData/completion/smart/functionLiterals/3.kt

@@ -5,4 +5,4 @@ fun bar() {
 }
 
 // ABSENT: "{...}"
-// EXIST: "{ (String, Int) -> ... }"
+// EXIST: "{ String, Int -> ... }"

idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.kt

@@ -91,11 +91,11 @@ public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
 
     fun testHigherOrderFunctionWithArg() = doTest(2, "filterNot", null, '\n')
 
-    fun testHigherOrderFunctionWithArgs1() = doTest(1, "foo", "foo", " { (String, Char) -> ... }", '\n')
+    fun testHigherOrderFunctionWithArgs1() = doTest(1, "foo", "foo", " { String, Char -> ... }", '\n')
 
     fun testHigherOrderFunctionWithArgs2() = doTest(1, "foo", "foo", "(p: (String, Char) -> Boolean)", '\n')
 
-    fun testHigherOrderFunctionWithArgs3() = doTest(1, "foo", "foo", " { (String, Char) -> ... }", '\n')
+    fun testHigherOrderFunctionWithArgs3() = doTest(1, "foo", "foo", " { String, Char -> ... }", '\n')
 
     fun testForceParenthesisForTabChar() = doTest(0, "some", null, '\t')