Update diagnostic tests

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

@@ -1,35 +0,0 @@
-// !USE_EXPERIMENTAL: kotlin.RequiresOptIn
-// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-
-@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/incorrectCallsWithRestrictions.kt

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

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

@@ -1,38 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// ALLOW_KOTLIN_PACKAGE
-// !WITH_NEW_INFERENCE
-// FILE: annotation.kt
-
-package kotlin
-
-annotation class BuilderInference
-
-// FILE: test.kt
-
-class Builder<T> {
-    fun add(t: T) {}
-}
-
-fun <S> build(@BuilderInference g: Builder<S>.() -> Unit): List<S> = TODO()
-fun <S> wrongBuild(g: Builder<S>.() -> Unit): List<S> = TODO()
-
-fun <S> Builder<S>.extensionAdd(s: S) {}
-
-@BuilderInference
-fun <S> Builder<S>.safeExtensionAdd(s: S) {}
-
-val member = build {
-    add(42)
-}
-
-val memberWithoutAnn = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>wrongBuild<!> {
-    add(42)
-}
-
-val extension = build {
-    extensionAdd("foo")
-}
-
-val safeExtension = build {
-    safeExtensionAdd("foo")
-}

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

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // ALLOW_KOTLIN_PACKAGE
 // !WITH_NEW_INFERENCE
@@ -25,11 +26,11 @@ val member = build {
     add(42)
 }
 
-val memberWithoutAnn = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>wrongBuild<!> {
+val memberWithoutAnn = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>wrongBuild<!> {
     add(42)
 }
 
-val extension = <!COULD_BE_INFERRED_ONLY_WITH_UNRESTRICTED_BUILDER_INFERENCE, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>build<!> {
+val extension = build {
     extensionAdd("foo")
 }
 

compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInferenceWithRestrictions.txt

@@ -1,8 +1,6 @@
 package
 
-public val extension: [ERROR : Type for build {
-    extensionAdd("foo")
-}]
+public val extension: kotlin.collections.List<kotlin.String>
 public val member: kotlin.collections.List<kotlin.Int>
 public val memberWithoutAnn: [ERROR : Type for wrongBuild {
     add(42)

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

@@ -1,33 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// ALLOW_KOTLIN_PACKAGE
-
-// 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/useInferenceInformationFromExtensionWithRestrictions.kt

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