Code completion: template item for function taking lambda with 2 or more parameters (KT-4855) + better handling of type instantiation in smart completion

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

@@ -0,0 +1,8 @@
+fun foo(p: (String, Char) -> Unit){}
+
+fun test() {
+    fo<caret>
+}
+
+// EXIST: { lookupString:"foo", itemText: "foo(p: (String, Char) -> Unit)", typeText:"Unit" }
+// EXIST: { lookupString:"foo", itemText: "foo { (String, Char) -> ... }", typeText:"Unit" }

idea/testData/completion/handlers/HigherOrderFunctionWithArgs1.kt

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

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

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

idea/testData/completion/handlers/HigherOrderFunctionWithArgs2.kt

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

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

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

idea/testData/completion/handlers/HigherOrderFunctionWithArgs3.kt

@@ -0,0 +1,6 @@
+fun foo(p : (String, Char) -> Boolean){}
+fun foo(p : (String, Boolean) -> Boolean){}
+
+fun main(args: Array<String>) {
+    fo<caret>
+}

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

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

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

@@ -0,0 +1,3 @@
+class Foo(p : () -> Unit)
+
+var a : Foo = <caret>

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

@@ -0,0 +1,3 @@
+class Foo(p : () -> Unit)
+
+var a : Foo = Foo { <caret> }

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

@@ -0,0 +1,3 @@
+class Foo(p : (String) -> Unit)
+
+var a : Foo = <caret>

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

@@ -0,0 +1,3 @@
+class Foo(p : (String) -> Unit)
+
+var a : Foo = Foo { <caret> }

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

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

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

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

idea/testData/completion/smart/Lambda4.kt

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