Update tests after rebase

compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.fir.kt

@@ -1,37 +0,0 @@
-// !LANGUAGE: +UnrestrictedBuilderInference
-// !USE_EXPERIMENTAL: kotlin.RequiresOptIn
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
-
-@file:OptIn(ExperimentalTypeInference::class)
-
-import kotlin.experimental.ExperimentalTypeInference
-
-class GenericController<T> {
-    suspend fun yield(t: T) {}
-    fun notYield(t: T) {}
-
-    suspend fun yieldBarReturnType(t: T) = t
-    fun barReturnType(): T = TODO()
-}
-
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
-
-val test1 = generate {
-    yield(3)
-}
-
-val test2 = generate {
-    yield(3)
-    notYield(3)
-}
-
-val test3 = generate {
-    yield(3)
-    yieldBarReturnType(3)
-}
-
-val test4 = generate {
-    yield(3)
-    barReturnType()
-}

compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +UnrestrictedBuilderInference
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
@@ -25,12 +26,12 @@ val test2 = generate {
     notYield(3)
 }
 
-val test3 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test3 = generate {
     yield(3)
     yieldBarReturnType(3)
 }
 
-val test4 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test4 = generate {
     yield(3)
     barReturnType()
 }

compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCallsWithRestrictions.kt

@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @file:OptIn(ExperimentalTypeInference::class)
 
@@ -25,12 +24,12 @@ val test2 = generate {
     notYield(3)
 }
 
-val test3 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
+val test3 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
     yield(3)
     yieldBarReturnType(3)
 }
 
-val test4 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
+val test4 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
     yield(3)
     barReturnType()
 }

compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.kt

@@ -28,7 +28,7 @@ val memberWithoutAnn = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>wrongBuild<
     add(42)
 }
 
-val extension = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>build<!> {
+val extension = build {
     extensionAdd("foo")
 }
 

compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.fir.kt

@@ -1,34 +0,0 @@
-// !LANGUAGE: +UnrestrictedBuilderInference
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
-
-// FILE: annotation.kt
-
-package kotlin
-
-annotation class BuilderInference
-
-// FILE: test.kt
-
-class GenericController<T> {
-    suspend fun yield(t: T) {}
-}
-
-suspend fun <S> GenericController<S>.extensionYield(s: S) {}
-
-@BuilderInference
-suspend fun <S> GenericController<S>.safeExtensionYield(s: S) {}
-
-fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit): List<S> = TODO()
-
-val normal = generate {
-    yield(42)
-}
-
-val extension = generate {
-    extensionYield("foo")
-}
-
-val safeExtension = generate {
-    safeExtensionYield("foo")
-}

compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
@@ -24,7 +25,7 @@ val normal = generate {
     yield(42)
 }
 
-val extension = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val extension = generate {
     extensionYield("foo")
 }
 

compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtensionWithRestrictions.kt

@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 // FILE: annotation.kt
 
@@ -24,7 +23,7 @@ val normal = generate {
     yield(42)
 }
 
-val extension = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
+val extension = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
     extensionYield("foo")
 }