From 8365eb54dd2b701c23c961a8def71222162aa766 Mon Sep 17 00:00:00 2001
From: "Denis.Zharkov" <denis.zharkov@jetbrains.com>
Date: Tue, 19 Dec 2023 18:43:54 +0100
Subject: [PATCH] K2: Adjust test data after PCLA implementation
 [multiLambdaRestriction]

^KT-59791 In Progress
---
 .../builderInference/issues/kt53422a.fir.kt   |  4 ++--
 .../builderInference/issues/kt53422b.fir.kt   | 10 ++++-----
 .../builderInference/issues/kt53553.fir.kt    | 12 +++++-----
 .../builderInference/issues/kt53740a.fir.kt   | 12 +++++-----
 .../builderInference/issues/kt53740b.fir.kt   | 12 +++++-----
 .../inference/builderInference/kt53422.fir.kt |  2 +-
 .../inference/builderInference/kt53639.fir.kt |  2 +-
 .../multiLambdaRestriction.fir.kt             | 22 +++++++++----------
 .../multiLambdaRestrictionDisabled.fir.kt     |  2 +-
 9 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt53422a.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt53422a.fir.kt
index 6208ac347d9..b16da0099f0 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt53422a.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt53422a.fir.kt
@@ -3,8 +3,8 @@
 
 fun test() {
     val buildee = buildFromValue(
-        innerBuild <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ setInnerTypeVariable(TargetType()) }<!>,
-        <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ <!BUILDER_INFERENCE_STUB_RECEIVER!>it.placeholderExtensionInvokeOnInnerBuildee()<!> }<!>
+        innerBuild { setInnerTypeVariable(TargetType()) },
+        { it.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>placeholderExtensionInvokeOnInnerBuildee<!>() }
     )
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt53422b.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt53422b.fir.kt
index 554027b0f6c..95f06b77c28 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt53422b.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt53422b.fir.kt
@@ -3,17 +3,17 @@
 
 fun test() {
     val buildee = stepByStepBuild(
-        <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
+        {
             it.<!UNRESOLVED_REFERENCE!>concreteTypeMemberProperty<!>
             TargetType()
-        }<!>,
-        <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
+        },
+        {
             consumeTargetTypeBase(it)
-        }<!>
+        }
     )
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
-    checkExactType<Buildee<TargetType>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<TargetType>; Buildee<TargetTypeBase>")!>buildee<!>)
+    checkExactType<Buildee<TargetType>>(buildee)
 }
 
 
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt53553.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt53553.fir.kt
index c167d393400..6bff97894af 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt53553.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt53553.fir.kt
@@ -2,17 +2,17 @@
 // CHECK_TYPE_WITH_EXACT
 
 fun test() {
-    val buildee = parallelBuild(
-        <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
+    val buildee = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>parallelBuild<!>(
+        {
             consumeTargetTypeBase(it)
-        }<!>,
-        <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
+        },
+        {
             consumeTargetType(it)
-        }<!>
+        }
     )
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
-    checkExactType<Buildee<TargetType>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<TargetType>; Buildee<TargetTypeBase>")!>buildee<!>)
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>checkExactType<!><<!CANNOT_INFER_PARAMETER_TYPE!>Buildee<TargetType><!>>(buildee)
 }
 
 
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt53740a.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt53740a.fir.kt
index 6f61986a215..60029a4ec69 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt53740a.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt53740a.fir.kt
@@ -3,16 +3,16 @@
 
 fun test() {
     val buildee = parallelBuild(
-        <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
+        {
             setTypeVariable(TargetType())
-        }<!>,
-        <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
-            consumeDifferentType(getTypeVariable())
-        }<!>
+        },
+        {
+            consumeDifferentType(<!ARGUMENT_TYPE_MISMATCH!>getTypeVariable()<!>)
+        }
     )
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
-    checkExactType<Buildee<TargetType>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<TargetType>; Buildee<kotlin.Any>")!>buildee<!>)
+    checkExactType<Buildee<TargetType>>(buildee)
 }
 
 
diff --git a/compiler/testData/diagnostics/tests/builderInference/issues/kt53740b.fir.kt b/compiler/testData/diagnostics/tests/builderInference/issues/kt53740b.fir.kt
index 46ff0dea365..7f12240c3ea 100644
--- a/compiler/testData/diagnostics/tests/builderInference/issues/kt53740b.fir.kt
+++ b/compiler/testData/diagnostics/tests/builderInference/issues/kt53740b.fir.kt
@@ -3,16 +3,16 @@
 
 fun test() {
     val buildee = parallelInOutBuild(
-        <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
+        {
             setInProjectedTypeVariable(TargetType())
-        }<!>,
-        <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
-            consumeDifferentType(getOutProjectedTypeVariable())
-        }<!>
+        },
+        {
+            consumeDifferentType(<!ARGUMENT_TYPE_MISMATCH!>getOutProjectedTypeVariable()<!>)
+        }
     )
     // exact type equality check — turns unexpected compile-time behavior into red code
     // considered to be non-user-reproducible code for the purposes of these tests
-    checkExactType<Buildee<TargetType>>(<!ARGUMENT_TYPE_MISMATCH("Buildee<TargetType>; Buildee<kotlin.Any>")!>buildee<!>)
+    checkExactType<Buildee<TargetType>>(buildee)
 }
 
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt53422.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt53422.fir.kt
index 9e7c7be6e8d..21ca35801c4 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt53422.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt53422.fir.kt
@@ -3,7 +3,7 @@
 fun test() {
     foo(
         flow { emit(0) }
-    ) <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ <!BUILDER_INFERENCE_STUB_RECEIVER!>it.collect <!TOO_MANY_ARGUMENTS!>{}<!><!> }<!>
+    ) { it.collect <!TOO_MANY_ARGUMENTS!>{}<!> }
 
     // 0. Initial
     // W <: Any / declared upper bound
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/kt53639.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/kt53639.fir.kt
index 25652802ba4..ece7065f880 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/kt53639.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/kt53639.fir.kt
@@ -12,7 +12,7 @@ data class Output(val source: InputWrapper<List<String>>)
 fun main2(input: InputWrapper<Unit>): Output {
     val output = input.doMapping(
         foo = { buildList { add("this is List<String>") } },
-        bar = <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ it.isNotEmpty() }<!>,
+        bar = { it.isNotEmpty() },
     )
 
     return Output(source = output)
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/multiLambdaRestriction.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/multiLambdaRestriction.fir.kt
index 7f606cad70f..9adf19a699c 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/multiLambdaRestriction.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/multiLambdaRestriction.fir.kt
@@ -9,9 +9,9 @@ fun <R> a(first: R, second: (List<R>) -> Unit) {}
 fun test1() {
     a(
         buildList { add("") },
-        second = <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
+        second = {
             it.myGenericExt()
-        }<!>
+        }
     )
 }
 
@@ -21,11 +21,11 @@ fun <R> b(first: () -> List<R>, second: (List<R>) -> Unit) {}
 fun test2() {
     b(
         first = {
-            buildList { add("") }
+            buildList { add(<!ARGUMENT_TYPE_MISMATCH!>""<!>) }
         },
-        second = <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{
+        second = {
             it.myExt() // Note: must be extension to add constraints
-        }<!>
+        }
     )
 }
 
@@ -45,13 +45,13 @@ fun test3() {
     )
 
     select (
-        myBuildList <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ add("") }<!>,
-        myBuildList <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ add(1) }<!>,
+        myBuildList { add("") },
+        myBuildList { add(1) },
     )
 
     select (
-        run { myBuildList <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ add("") }<!> },
-        myBuildList <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ add(1) }<!>,
+        run { myBuildList { add("") } },
+        myBuildList { add(1) },
     )
 }
 
@@ -64,7 +64,7 @@ fun <D> buildPartList(left: MutableList<D>.() -> Unit, right: MutableList<D>.()
 
 fun test4() {
     buildPartList(
-        left = <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ add(1) }<!>,
-        right = <!BUILDER_INFERENCE_MULTI_LAMBDA_RESTRICTION!>{ add("") }<!>
+        left = { add(1) },
+        right = { add("") }
     )
 }
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/multiLambdaRestrictionDisabled.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/multiLambdaRestrictionDisabled.fir.kt
index 00e223e118a..c0a937efc58 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/multiLambdaRestrictionDisabled.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/multiLambdaRestrictionDisabled.fir.kt
@@ -22,7 +22,7 @@ fun <R> b(first: () -> List<R>, second: (List<R>) -> Unit) {}
 fun test2() {
     b(
         first = {
-            buildList { add("") }
+            buildList { add(<!ARGUMENT_TYPE_MISMATCH!>""<!>) }
         },
         second = {
             it.myExt() // Note: must be extension to add constraints