Remove explicit enabling the new type inference from test data

2022-06-02 17:15:35 +02:00
parent 224beb24eb
commit 42e71f8c53
1097 changed files with 73 additions and 1129 deletions
@@ -1,5 +1,4 @@
 $TESTDATA_DIR$/newInferenceImpliesSamConversions.kt
 -d
 $TEMP_DIR$
-XXLanguage\:+NewInference
 -XXLanguage\:-SamConversionForKotlinFunctions
@@ -1,7 +1,6 @@
 warning: ATTENTION!
 This build uses unsafe internal compiler arguments:

-XXLanguage:+NewInference
 -XXLanguage:-SamConversionForKotlinFunctions

 This mode is not recommended for production use,
@@ -1,4 +1,3 @@
 $TESTDATA_DIR$/functionReferenceWithDefaultValuesFeatureIsEnabledWithNewInference.kt
 -d
 $TEMP_DIR$
-XXLanguage\:+NewInference
@@ -1,10 +1 @@
-warning: ATTENTION!
-This build uses unsafe internal compiler arguments:
-
-XXLanguage:+NewInference
-
-This mode is not recommended for production use,
-as no stability/compatibility guarantees are given on
-compiler or generated code. Use it at your own risk!
-
 OK
@@ -1,4 +1,3 @@
 $TESTDATA_DIR$/newInferenceImpliesProgressiveModeForNI.kt
 -d
 $TEMP_DIR$
-XXLanguage\:+NewInference
@@ -1,16 +1,11 @@
-warning: ATTENTION!
-This build uses unsafe internal compiler arguments:
-
-XXLanguage:+NewInference
-
-This mode is not recommended for production use,
-as no stability/compatibility guarantees are given on
-compiler or generated code. Use it at your own risk!
-
 compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt:6:13: warning: parameter 'x' is never used
    fun bar(x: Int = 0): String = ""
            ^
 compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt:9:13: warning: variable 'r1' is never used
        val r1 = foo(::bar)
            ^
+compiler/testData/cli/jvm/newInferenceImpliesProgressiveModeForNI.kt:9:22: warning: candidate resolution will be changed soon, please use fully qualified name to invoke the following closer candidate explicitly '
+public final fun bar(x: Int = ...): String defined in Scope'
+        val r1 = foo(::bar)
+                     ^
 OK
@@ -1,4 +1,3 @@
 $TESTDATA_DIR$/newInferenceImpliesSamConversions.kt
 -d
 $TEMP_DIR$
-XXLanguage\:+NewInference
@@ -1,12 +1,3 @@
-warning: ATTENTION!
-This build uses unsafe internal compiler arguments:
-
-XXLanguage:+NewInference
-
-This mode is not recommended for production use,
-as no stability/compatibility guarantees are given on
-compiler or generated code. Use it at your own risk!
-
 compiler/testData/cli/jvm/newInferenceImpliesSamConversions.kt:1:9: warning: parameter 'r' is never used
 fun foo(r: Runnable) {}
        ^
@@ -1,4 +1,3 @@
 $TESTDATA_DIR$/standaloneSamConversionsAreEnabledWithNewInference.kt
 -d
 $TEMP_DIR$
-XXLanguage\:+NewInference
@@ -1,10 +1 @@
-warning: ATTENTION!
-This build uses unsafe internal compiler arguments:
-
-XXLanguage:+NewInference
-
-This mode is not recommended for production use,
-as no stability/compatibility guarantees are given on
-compiler or generated code. Use it at your own risk!
-
 OK
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // MODULE: m1-common
 // FILE: test.kt

@@ -1,5 +1,4 @@
 // SKIP_TXT
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 package test
@@ -1,5 +1,4 @@
 // SKIP_TXT
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 package test
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 /*
 * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
+// !LANGUAGE: +FunctionReferenceWithDefaultValueAsOtherType

 fun foo(a: String, b: Int = 5): String {
    return a + b
@@ -1,4 +1,4 @@
-// !LANGUAGE: +SamConversionPerArgument +NewInference +ProhibitVarargAsArrayAfterSamArgument
+// !LANGUAGE: +SamConversionPerArgument +ProhibitVarargAsArrayAfterSamArgument
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 // FILE: A.java
@@ -1,4 +1,4 @@
-// !LANGUAGE: +SamConversionPerArgument +NewInference +ProhibitVarargAsArrayAfterSamArgument
+// !LANGUAGE: +SamConversionPerArgument +ProhibitVarargAsArrayAfterSamArgument
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 // FILE: A.java
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // ISSUE: KT-35896

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun foo(vararg ints: Int) {}
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun foo(vararg ints: Int) {}
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun <A1> fun2(f: kotlin.reflect.KFunction1<A1, Unit>, a: A1) {
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 import kotlin.reflect.KProperty1
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 import kotlin.reflect.KProperty1
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // Issue: KT-32256

@@ -1,7 +1,6 @@
 // FIR_IDENTICAL
 // SKIP_TXT
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: +NewInference

 fun main() {
    Configuration().commands {
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // ISSUE: KT-35959

@@ -1,7 +1,6 @@
 // FIR_IDENTICAL
 // SKIP_TXT
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: +NewInference

 interface Inv<T>

@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !LANGUAGE: +NewInference

 import kotlin.reflect.KFunction1
 import kotlin.reflect.KFunction2
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 class DTO {
    val q: Int = 0
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 class DTO {
    val q: Int = 0
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // SKIP_TXT
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun check1(p: kotlin.reflect.KProperty1<*, *>) {}
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun foo(x: Int) {}
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun foo(x: Int) {}
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // SKIP_TXT
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE

@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE

 fun foo(s: String) {}
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 import kotlin.reflect.KFunction2
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION

 class A {
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION

 class A {
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 import kotlin.reflect.KProperty1
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION

 interface Parent
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION

 interface Parent
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION

 interface A
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION

 interface A
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // SKIP_TXT
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 import kotlin.reflect.KProperty0
 import kotlin.reflect.KProperty1
@@ -1,5 +1,4 @@
 // SKIP_TXT
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 import kotlin.reflect.KProperty0

@@ -1,5 +1,4 @@
 // SKIP_TXT
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 import kotlin.reflect.KProperty0

@@ -1,5 +1,4 @@
 // SKIP_TXT
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: JavaClass.java
 public class JavaClass<R> {
@@ -1,5 +1,4 @@
 // SKIP_TXT
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: JavaClass.java
 public class JavaClass<R> {
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface Base
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE

 interface A
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface A
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface A
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference

 interface Base

@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // WITH_STDLIB

@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 import kotlin.reflect.KProperty1
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 import kotlin.reflect.*
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER

 fun takeArray(array: Array<String>) {}
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 // !CHECK_TYPE
 // Issue: KT-30406
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 // !CHECK_TYPE
 // Issue: KT-30406
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 import kotlin.reflect.KProperty
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE

 class Delegate<T>
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_VARIABLE

 import kotlin.reflect.KProperty
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
+// !LANGUAGE: +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun interface Foo {
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference +SamConversionForKotlinFunctions +SamConversionPerArgument +FunctionalInterfaceConversion
+// !LANGUAGE: +SamConversionForKotlinFunctions +SamConversionPerArgument +FunctionalInterfaceConversion
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun interface KRunnable {
@@ -1,4 +1,4 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
+// !LANGUAGE: +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun interface Base {
@@ -1,4 +1,4 @@
-// !LANGUAGE: +NewInference +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
+// !LANGUAGE: +FunctionalInterfaceConversion +SamConversionPerArgument +SamConversionForKotlinFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 fun interface Base {
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference +SamConversionForKotlinFunctions +SamConversionPerArgument +FunctionalInterfaceConversion
+// !LANGUAGE: +SamConversionForKotlinFunctions +SamConversionPerArgument +FunctionalInterfaceConversion
 // !CHECK_TYPE

 fun interface F<S> {
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference +SamConversionForKotlinFunctions +SamConversionPerArgument +FunctionalInterfaceConversion
+// !LANGUAGE: +SamConversionForKotlinFunctions +SamConversionPerArgument +FunctionalInterfaceConversion

 interface J {
    fun foo1(r: KRunnable)
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference +SamConversionForKotlinFunctions +SamConversionPerArgument +FunctionalInterfaceConversion
+// !LANGUAGE: +SamConversionForKotlinFunctions +SamConversionPerArgument +FunctionalInterfaceConversion
 // !DIAGNOSTICS: -UNUSED_PARAMETER -NOTHING_TO_INLINE

 fun interface SuspendRunnable {
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: +NewInference
 // SKIP_TXT
 // Issue: KT-35168

@@ -1,7 +1,6 @@
 // FIR_IDENTICAL
 // SKIP_TXT
 // !CHECK_TYPE
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface FirMemberDeclaration : FirDeclaration
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 class X {
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 class X {
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: +NewInference

 interface ILength {
    val length: Int
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: +NewInference

 interface ILength {
    val length: Int
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 inline fun <T, reified S> foo(x: T?, y: T): T {
    if (x is S) return <!RETURN_TYPE_MISMATCH!>x<!>
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 inline fun <T, reified S> foo(x: T?, y: T): T {
    if (x is S) return <!TYPE_MISMATCH!>x<!>
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 fun simpleTypeAndNumberType(b: Comparable<*>?) {
    if (b is Byte?) {
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 fun simpleTypeAndNumberType(b: Comparable<*>?) {
    if (b is Byte?) {
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 abstract class Expr<T>
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface A
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface A
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 // FILE: A.java
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference

 import kotlin.reflect.KClass

@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface CollectorMock<A, R>
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 class Obj

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 class Obj

@@ -1,7 +1,6 @@
 // FIR_IDENTICAL
 // SKIP_TXT
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: +NewInference

 fun foo(f: () -> Unit) {}
 fun bar(): Int = 42
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_VARIABLE

 fun foo() {
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 class Obj

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference

 class Obj

@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNCHECKED_CAST

 class Foo<T>
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNCHECKED_CAST

 class Foo<T>
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface Foo<F> {
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface Foo<F> {
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface Base<out T>
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 interface Base<out T>
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION

 fun <T> select(x: T, y: T): T = x
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION

 fun <T> select(x: T, y: T): T = x
--- a/Show More
+++ b/Show More