diff --git a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName0.kt b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName1.kt
similarity index 100%
rename from idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName0.kt
rename to idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName1.kt
diff --git a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName3.kt b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName3.kt
new file mode 100644
index 00000000000..260f160dd77
--- /dev/null
+++ b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName3.kt
@@ -0,0 +1,5 @@
+fun bar() {
+    val handler = { i, <caret> }
+}
+
+// NUMBER: 0
diff --git a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt
index 260f160dd77..bb9325e7bd4 100644
--- a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt
+++ b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt
@@ -1,5 +1,9 @@
 fun bar() {
-    val handler = { i, <caret> }
+    val handler = { <caret>
+        foo()
+    }
 }
 
-// NUMBER: 0
+// INVOCATION_COUNT: 0
+// EXIST: bar
+// EXIST: null
diff --git a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName5.kt b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName5.kt
deleted file mode 100644
index bb9325e7bd4..00000000000
--- a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName5.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-fun bar() {
-    val handler = { <caret>
-        foo()
-    }
-}
-
-// INVOCATION_COUNT: 0
-// EXIST: bar
-// EXIST: null
diff --git a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType5.kt b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType2.kt
similarity index 63%
rename from idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType5.kt
rename to idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType2.kt
index 7c6325deb21..060a49f860b 100644
--- a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType5.kt
+++ b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType2.kt
@@ -1,5 +1,5 @@
 fun bar() {
-    val handler = { i: Map<String, <caret> }
+    val handler = { i: Int, s: <caret> }
 }
 
 // EXIST: Int
diff --git a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt
index 060a49f860b..d36cdebac48 100644
--- a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt
+++ b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt
@@ -1,5 +1,5 @@
 fun bar() {
-    val handler = { i: Int, s: <caret> }
+    val handler = { i: List<<caret>> }
 }
 
 // EXIST: Int
diff --git a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt
index d36cdebac48..7c6325deb21 100644
--- a/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt
+++ b/idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt
@@ -1,5 +1,5 @@
 fun bar() {
-    val handler = { i: List<<caret>> }
+    val handler = { i: Map<String, <caret> }
 }
 
 // EXIST: Int
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
index 9ad422833e5..2b1ad07c25b 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
@@ -1275,9 +1275,9 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/lambdaSignature"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
-            @TestMetadata("ParameterName0.kt")
-            public void testParameterName0() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName0.kt");
+            @TestMetadata("ParameterName1.kt")
+            public void testParameterName1() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName1.kt");
                 doTest(fileName);
             }
 
@@ -1287,24 +1287,30 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
                 doTest(fileName);
             }
 
+            @TestMetadata("ParameterName3.kt")
+            public void testParameterName3() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName3.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ParameterName4.kt")
             public void testParameterName4() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("ParameterName5.kt")
-            public void testParameterName5() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName5.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("ParameterType1.kt")
             public void testParameterType1() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType1.kt");
                 doTest(fileName);
             }
 
+            @TestMetadata("ParameterType2.kt")
+            public void testParameterType2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType2.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ParameterType3.kt")
             public void testParameterType3() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt");
@@ -1316,12 +1322,6 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
                 String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt");
                 doTest(fileName);
             }
-
-            @TestMetadata("ParameterType5.kt")
-            public void testParameterType5() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType5.kt");
-                doTest(fileName);
-            }
         }
 
         @TestMetadata("idea/idea-completion/testData/basic/common/namedArguments")
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
index 405c2c9f8ba..24bad404838 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
@@ -1275,9 +1275,9 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/lambdaSignature"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
-            @TestMetadata("ParameterName0.kt")
-            public void testParameterName0() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName0.kt");
+            @TestMetadata("ParameterName1.kt")
+            public void testParameterName1() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName1.kt");
                 doTest(fileName);
             }
 
@@ -1287,24 +1287,30 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
                 doTest(fileName);
             }
 
+            @TestMetadata("ParameterName3.kt")
+            public void testParameterName3() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName3.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ParameterName4.kt")
             public void testParameterName4() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt");
                 doTest(fileName);
             }
 
-            @TestMetadata("ParameterName5.kt")
-            public void testParameterName5() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName5.kt");
-                doTest(fileName);
-            }
-
             @TestMetadata("ParameterType1.kt")
             public void testParameterType1() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType1.kt");
                 doTest(fileName);
             }
 
+            @TestMetadata("ParameterType2.kt")
+            public void testParameterType2() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType2.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("ParameterType3.kt")
             public void testParameterType3() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt");
@@ -1316,12 +1322,6 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
                 String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt");
                 doTest(fileName);
             }
-
-            @TestMetadata("ParameterType5.kt")
-            public void testParameterType5() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType5.kt");
-                doTest(fileName);
-            }
         }
 
         @TestMetadata("idea/idea-completion/testData/basic/common/namedArguments")