diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt.txt index 3a45ad54790..86f4514d770 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.kt.txt @@ -9,12 +9,12 @@ class Test : J { field = j private get - @NotNull(...) + @NotNull() override fun returnNotNull(): @EnhancedNullability String { return #j.returnNotNull() } - @Nullable(...) + @Nullable() override fun returnNullable(): @EnhancedNullability String? { return #j.returnNullable() } diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.kt.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.kt.txt index 711c1e775ef..2f363923fe6 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.kt.txt @@ -31,8 +31,8 @@ annotation class AA : Annotation { } -@A2(...) -@AA(...) +@A2(a = A1(x = 42)) +@AA(xs = [A1(x = 1), A1(x = 2)]) fun test() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt.txt index 81c99af6ec3..00f1bbc1501 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.kt.txt @@ -13,23 +13,23 @@ annotation class A : Annotation { } -@A(...) +@A(x = "abc", y = 123) fun test1() { } -@A(...) +@A(x = "def") fun test2() { } -@A(...) +@A(x = "ghi") fun test3() { } -@A(...) +@A(, y = 456) fun test4() { } -@A(...) +@A() fun test5() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.kt.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.kt.txt index 85037c6c8e0..8097e7ff61d 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.kt.txt @@ -9,15 +9,15 @@ annotation class A : Annotation { } -@A(...) +@A(xs = ["abc", "def"]) fun test1() { } -@A(...) +@A(xs = ["abc"]) fun test2() { } -@A(...) +@A(xs = []) fun test3() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.kt.txt b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.kt.txt index 022c8245694..3c178b9482e 100644 --- a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.kt.txt @@ -20,13 +20,13 @@ annotation class TestAnnWithStringArray : Annotation { } -@TestAnnWithIntArray(...) -@TestAnnWithStringArray(...) +@TestAnnWithIntArray(x = [1, 2, 3]) +@TestAnnWithStringArray(x = ["a", "b", "c"]) fun test1() { } -@TestAnnWithIntArray(...) -@TestAnnWithStringArray(...) +@TestAnnWithIntArray(x = [4, 5, 6]) +@TestAnnWithStringArray(x = ["d", "e", "f"]) fun test2() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.kt.txt index 6e6eab96d8e..b5500f3de3b 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.kt.txt @@ -21,7 +21,7 @@ class C { } -@A(...) +@A(klass = C::class) fun test1() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt index d16a9469969..e50f8ed8d4a 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.kt.txt @@ -9,7 +9,7 @@ annotation class TestAnn : Annotation { } -@TestAnn(...) +@TestAnn(x = "class") class TestClass { constructor() /* primary */ { TODO("IrDelegatingConstructorCall") @@ -22,14 +22,14 @@ class TestClass { } -@TestAnn(...) +@TestAnn(x = "interface") interface TestInterface { } -@TestAnn(...) +@TestAnn(x = "object") object TestObject { private constructor() /* primary */ { TODO("IrDelegatingConstructorCall") @@ -49,7 +49,7 @@ class Host { } - @TestAnn(...) + @TestAnn(x = "companion") companion object TestCompanion { private constructor() /* primary */ { TODO("IrDelegatingConstructorCall") @@ -67,7 +67,7 @@ class Host { } -@TestAnn(...) +@TestAnn(x = "enum") enum class TestEnum : Enum { private constructor() /* primary */ { TODO("IrEnumConstructorCall") @@ -88,7 +88,7 @@ enum class TestEnum : Enum { } -@TestAnn(...) +@TestAnn(x = "annotation") annotation class TestAnnotation : Annotation { constructor() /* primary */ diff --git a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.kt.txt b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.kt.txt index 22b8ae751cd..c88bd0dff4f 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.kt.txt @@ -13,11 +13,11 @@ annotation class A : Annotation { } -@A(...) +@A(x = 1) fun test1() { } -@A(...) +@A(x = 2) fun test2() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.kt.txt index 0eb4c898228..063b9b7a047 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.kt.txt @@ -10,14 +10,14 @@ annotation class TestAnn : Annotation { } class TestClass { - @TestAnn(...) + @TestAnn(x = 1) constructor() /* primary */ { TODO("IrDelegatingConstructorCall") /* InstanceInitializerCall */ } - @TestAnn(...) + @TestAnn(x = 2) constructor(x: Int) { TODO("IrDelegatingConstructorCall") } diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.kt.txt index 93bd5b87aa4..d9811eb7188 100644 --- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.kt.txt @@ -36,18 +36,18 @@ class Cell { val test1: Int /* by */ field = Cell(value = 1) - @A(...) + @A(x = "test1.get") get(): Int { return #test1$delegate.getValue(thisRef = null, kProp = ::test1) } var test2: Int /* by */ field = Cell(value = 2) - @A(...) + @A(x = "test2.get") get(): Int { return #test2$delegate.getValue(thisRef = null, kProp = ::test2) } - @A(...) + @A(x = "test2.set") set(: Int) { return #test2$delegate.setValue(thisRef = null, kProp = ::test2, newValue = ) } diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt index 7b20269bb30..638abe752af 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt @@ -16,8 +16,8 @@ open enum class TestEnum : Enum { } - @TestAnn(...) - ENTRY1 init = TODO("IrEnumConstructorCall") @TestAnn(...) + @TestAnn(x = "ENTRY1") + ENTRY1 init = TODO("IrEnumConstructorCall") @TestAnn(x = "ENTRY2") ENTRY2 init = TODO("IrEnumConstructorCall") diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt index 738f36ef3cf..cfc72b1db32 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt @@ -29,7 +29,7 @@ annotation class TestAnn : Annotation { } -@TestAnn(...) +@TestAnn(x = En) fun test1() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.kt.txt index 6f671ccd6ea..2a5dc1df86b 100644 --- a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.kt.txt @@ -1,7 +1,7 @@ -@file:A(...) +@file:A(x = "File annotation") package test -@Target(...) +@Target(allowedTargets = [AnnotationTarget]) annotation class A : Annotation { constructor(x: String) /* primary */ val x: String diff --git a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.kt.txt index 615eedabed1..21ea5ae1e19 100644 --- a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.kt.txt @@ -9,7 +9,7 @@ annotation class TestAnn : Annotation { } -@TestAnn(...) +@TestAnn(x = 42) fun testSimpleFunction() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt.txt b/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt.txt index 0adaea091db..7ab3c0d2ffc 100644 --- a/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.kt.txt @@ -1,12 +1,12 @@ -@JavaAnn(...) +@JavaAnn() fun test1() { } -@JavaAnn(...) +@JavaAnn(value = "abc", i = 123) fun test2() { } -@JavaAnn(...) +@JavaAnn(value = "abc", i = 123) fun test3() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.kt.txt index de2ee0b7ac9..e658174a19c 100644 --- a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.kt.txt @@ -10,7 +10,7 @@ annotation class A : Annotation { } fun foo(m: Map) { - @A(...) + @A(x = "foo/test") val test: Int val test$delegate: Lazy = lazy(initializer = local fun (): Int { return 42 diff --git a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.kt.txt index 671adf72795..edf356c30d0 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.kt.txt @@ -9,7 +9,7 @@ annotation class TestAnn : Annotation { } -@TestAnn(...) +@TestAnn(x = "testVal.property") val testVal: String field = "" get diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.kt.txt index 1b03d965163..ef7f463ecae 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.kt.txt @@ -18,14 +18,14 @@ class C { val x: Int field = x - @A(...) + @A(x = "C.x.get") get var y: Int field = y - @A(...) + @A(x = "C.y.get") get - @A(...) + @A(x = "C.y.set") set diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.kt.txt index aeeb6ff9e3b..a5b4a7a3705 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.kt.txt @@ -10,29 +10,29 @@ annotation class TestAnn : Annotation { } val test1: String - @TestAnn(...) + @TestAnn(x = "test1.get") get(): String { return "" } var test2: String - @TestAnn(...) + @TestAnn(x = "test2.get") get(): String { return "" } - @TestAnn(...) + @TestAnn(x = "test2.set") set(value: String) { } val test3: String field = "" - @TestAnn(...) + @TestAnn(x = "test3.get") get var test4: String field = "" - @TestAnn(...) + @TestAnn(x = "test4.get") get - @TestAnn(...) + @TestAnn(x = "test4.set") set diff --git a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.kt.txt b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.kt.txt index fe14e8913cc..ab258cd7824 100644 --- a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.kt.txt @@ -9,7 +9,7 @@ annotation class A : Annotation { } -@A(...) +@A(xs = [["a"], ["b"]]) fun test() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.kt.txt index 64585d31b17..a1968539cec 100644 --- a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.kt.txt @@ -1,4 +1,4 @@ -@Target(...) +@Target(allowedTargets = [AnnotationTarget]) annotation class TestAnn : Annotation { constructor(x: String) /* primary */ val x: String @@ -10,5 +10,5 @@ annotation class TestAnn : Annotation { } -@TestAnn(...) +@TestAnn(x = "TestTypeAlias") typealias TestTypeAlias = String diff --git a/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.kt.txt index 4ac7ec179e9..1434b0cc418 100644 --- a/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.kt.txt @@ -1,4 +1,4 @@ -@Target(...) +@Target(allowedTargets = [AnnotationTarget]) annotation class Anno : Annotation { constructor() /* primary */ diff --git a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.kt.txt b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.kt.txt index 942b42a11a7..71e88ec54c8 100644 --- a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.kt.txt @@ -31,15 +31,15 @@ annotation class AA : Annotation { } -@A1(...) -@A2(...) -@AA(...) +@A1(xs = [1, 2, 3]) +@A2(xs = ["a", "b", "c"]) +@AA(xs = [A1(xs = [4]), A1(xs = [5]), A1(xs = [6])]) fun test1() { } -@A1(...) -@A2(...) -@AA(...) +@A1(xs = []) +@A2(xs = []) +@AA(xs = []) fun test2() { } diff --git a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.kt.txt index b9795f116f8..cf6e8abd585 100644 --- a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.kt.txt @@ -10,9 +10,9 @@ annotation class TestAnn : Annotation { } fun foo() { - @TestAnn(...) + @TestAnn(x = "foo/testVal") val testVal: String = "testVal" - @TestAnn(...) + @TestAnn(x = "foo/testVar") var testVar: String = "testVar" } diff --git a/compiler/testData/ir/irText/declarations/deprecatedProperty.kt.txt b/compiler/testData/ir/irText/declarations/deprecatedProperty.kt.txt index af4c0bc60ad..34356b85bf0 100644 --- a/compiler/testData/ir/irText/declarations/deprecatedProperty.kt.txt +++ b/compiler/testData/ir/irText/declarations/deprecatedProperty.kt.txt @@ -1,44 +1,44 @@ -@Deprecated(...) +@Deprecated(message = "") val testVal: Int field = 1 get -@Deprecated(...) +@Deprecated(message = "") var testVar: Int field = 1 get set -@Deprecated(...) +@Deprecated(message = "") val testValWithExplicitDefaultGet: Int field = 1 get -@Deprecated(...) +@Deprecated(message = "") val testValWithExplicitGet: Int get(): Int { return 1 } -@Deprecated(...) +@Deprecated(message = "") var testVarWithExplicitDefaultGet: Int field = 1 get set -@Deprecated(...) +@Deprecated(message = "") var testVarWithExplicitDefaultSet: Int field = 1 get set -@Deprecated(...) +@Deprecated(message = "") var testVarWithExplicitDefaultGetSet: Int field = 1 get set -@Deprecated(...) +@Deprecated(message = "") var testVarWithExplicitGetSet: Int get(): Int { return 1 @@ -46,18 +46,18 @@ var testVarWithExplicitGetSet: Int set(v: Int) { } -@Deprecated(...) +@Deprecated(message = "") lateinit var testLateinitVar: Any get set -@Deprecated(...) +@Deprecated(message = "") val Any.testExtVal: Int get(): Int { return 1 } -@Deprecated(...) +@Deprecated(message = "") var Any.textExtVar: Int get(): Int { return 1 diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.kt.txt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.kt.txt index 8d420ce8046..7bb59541a43 100644 --- a/compiler/testData/ir/irText/declarations/fileWithAnnotations.kt.txt +++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.kt.txt @@ -1,4 +1,4 @@ -@file:JvmName(...) +@file:JvmName(name = "FileWithAnnotations") fun foo() { } diff --git a/compiler/testData/ir/irText/declarations/typeAlias.kt.txt b/compiler/testData/ir/irText/declarations/typeAlias.kt.txt index 68d461e21a3..f37b3737bef 100644 --- a/compiler/testData/ir/irText/declarations/typeAlias.kt.txt +++ b/compiler/testData/ir/irText/declarations/typeAlias.kt.txt @@ -11,7 +11,7 @@ class C { } - @Suppress(...) + @Suppress(names = ["TOPLEVEL_TYPEALIASES_ONLY"]) typealias TestNested = String diff --git a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt index 8371df7b87c..73c5a3b80b3 100644 --- a/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt +++ b/compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt @@ -100,7 +100,7 @@ fun test5(a: Any) { a as Function1 /*~> Unit */ { // BLOCK val tmp0_array: A = A - val tmp2_sam: IFoo = a /*as Function1<@ParameterName(...) Int, Unit> */ /*-> IFoo */ + val tmp2_sam: IFoo = a /*as Function1<@ParameterName(name = "i") Int, Unit> */ /*-> IFoo */ tmp0_array.set(i = tmp2_sam, newValue = tmp0_array.get(i = tmp2_sam).plus(other = 1)) } } diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall.kt.txt b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall.kt.txt index 695c032f2d0..799c183c678 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall.kt.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall.kt.txt @@ -4,6 +4,6 @@ fun test1(f: Function1): C<@FlexibleNullability String?> { fun test2(x: Any) { x as Function1 /*~> Unit */ - C<@FlexibleNullability String?>(jxx = x /*as Function1<@ParameterName(...) @FlexibleNullability String?, @FlexibleNullability String?> */ /*-> @FlexibleNullability J<@FlexibleNullability String?, @FlexibleNullability String?>? */) /*~> Unit */ + C<@FlexibleNullability String?>(jxx = x /*as Function1<@ParameterName(name = "x") @FlexibleNullability String?, @FlexibleNullability String?> */ /*-> @FlexibleNullability J<@FlexibleNullability String?, @FlexibleNullability String?>? */) /*~> Unit */ } diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.kt.txt b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.kt.txt index 76b72398f61..78a3a61152b 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.kt.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.kt.txt @@ -44,6 +44,6 @@ fun testGenericJavaCtor1(f: Function1): G<@FlexibleNullability Stri fun testGenericJavaCtor2(x: Any) { x as Function1 /*~> Unit */ - G<@FlexibleNullability String?, @FlexibleNullability Int?>(x = x /*as Function1<@ParameterName(...) @FlexibleNullability String?, @FlexibleNullability Int?> */ /*-> @FlexibleNullability J<@FlexibleNullability Int?, @FlexibleNullability String?>? */) /*~> Unit */ + G<@FlexibleNullability String?, @FlexibleNullability Int?>(x = x /*as Function1<@ParameterName(name = "x") @FlexibleNullability String?, @FlexibleNullability Int?> */ /*-> @FlexibleNullability J<@FlexibleNullability Int?, @FlexibleNullability String?>? */) /*~> Unit */ } diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.kt.txt b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.kt.txt index 927108ed90c..0b7296342a5 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.kt.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.kt.txt @@ -26,7 +26,7 @@ fun test4(a: Any) { fun test5(a: Any) { a as Function1 /*~> Unit */ - bar<@FlexibleNullability String?>(j = a /*as Function1<@ParameterName(...) @FlexibleNullability String?, @FlexibleNullability String?> */ /*-> @FlexibleNullability J<@FlexibleNullability String?>? */) + bar<@FlexibleNullability String?>(j = a /*as Function1<@ParameterName(name = "x") @FlexibleNullability String?, @FlexibleNullability String?> */ /*-> @FlexibleNullability J<@FlexibleNullability String?>? */) } fun test6(a: Function1) { @@ -35,7 +35,7 @@ fun test6(a: Function1) { fun test7(a: Any) { a as Function1 /*~> Unit */ - bar<@FlexibleNullability T?>(j = a /*as Function1<@ParameterName(...) @FlexibleNullability T?, @FlexibleNullability T?> */ /*-> @FlexibleNullability J<@FlexibleNullability T?>? */) + bar<@FlexibleNullability T?>(j = a /*as Function1<@ParameterName(name = "x") @FlexibleNullability T?, @FlexibleNullability T?> */ /*-> @FlexibleNullability J<@FlexibleNullability T?>? */) } fun test8(efn: @ExtensionFunctionType Function1): J<@FlexibleNullability String?> { diff --git a/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.kt.txt b/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.kt.txt index a0ca0adc401..8757821451f 100644 --- a/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.kt.txt +++ b/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.kt.txt @@ -24,7 +24,7 @@ annotation class State : Annotation { } -@State(...) +@State(name = "1", storages = [Storage(value = "HELLO")]) class Test { constructor() /* primary */ { TODO("IrDelegatingConstructorCall") diff --git a/compiler/testData/ir/irText/firProblems/deprecated.kt.txt b/compiler/testData/ir/irText/firProblems/deprecated.kt.txt index eae1d38ae00..11d90a9c7dc 100644 --- a/compiler/testData/ir/irText/firProblems/deprecated.kt.txt +++ b/compiler/testData/ir/irText/firProblems/deprecated.kt.txt @@ -2,12 +2,12 @@ fun create(): String { return "OK" } -@Deprecated(...) +@Deprecated(message = "Use create() instead()", replaceWith = ReplaceWith(expression = "create()", imports = [])) fun create(s: String): String { return create() } -@Deprecated(...) +@Deprecated(message = "Use create() instead()") fun create(b: Boolean): String { return create() } diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt index 3db7e18aa7d..e8234dee409 100644 --- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt +++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt @@ -1,4 +1,4 @@ -@OptIn(...) +@OptIn(markerClass = [ExperimentalTypeInference::class]) fun scopedFlow(block: @ExtensionFunctionType SuspendFunction2, Unit>): Flow { return flow(block = local suspend fun FlowCollector.() { val collector: FlowCollector = @@ -10,7 +10,7 @@ fun scopedFlow(block: @ExtensionFunctionType SuspendFunction2 Flow.onCompletion(action: @ExtensionFunctionType SuspendFunction2, @ParameterName(...) Throwable?, Unit>): Flow { +fun Flow.onCompletion(action: @ExtensionFunctionType SuspendFunction2, @ParameterName(name = "cause") Throwable?, Unit>): Flow { return unsafeFlow(block = local suspend fun FlowCollector.() { val safeCollector: SafeCollector = SafeCollector(collector = ) safeCollector.invokeSafely(action = action) @@ -18,16 +18,16 @@ fun Flow.onCompletion(action: @ExtensionFunctionType SuspendFuncti ) } -suspend fun FlowCollector.invokeSafely(action: @ExtensionFunctionType SuspendFunction2, @ParameterName(...) Throwable?, Unit>) { +suspend fun FlowCollector.invokeSafely(action: @ExtensionFunctionType SuspendFunction2, @ParameterName(name = "cause") Throwable?, Unit>) { } -@OptIn(...) +@OptIn(markerClass = [ExperimentalTypeInference::class]) inline fun unsafeFlow(crossinline block: @ExtensionFunctionType SuspendFunction1, Unit>): Flow { TODO() } -@Deprecated(...) -fun Flow.onCompletion(action: SuspendFunction1<@ParameterName(...) Throwable?, Unit>): Flow { +@Deprecated(message = "binary compatibility with a version w/o FlowCollector receiver", level = DeprecationLevel) +fun Flow.onCompletion(action: SuspendFunction1<@ParameterName(name = "cause") Throwable?, Unit>): Flow { return .onCompletion(action = local suspend fun FlowCollector.(it: Throwable?) { action.invoke(p1 = it) } @@ -86,17 +86,17 @@ class SafeCollector : FlowCollector { } -@OptIn(...) +@OptIn(markerClass = [ExperimentalTypeInference::class]) fun flow(block: @ExtensionFunctionType SuspendFunction1, Unit>): Flow { TODO() } -@OptIn(...) +@OptIn(markerClass = [ExperimentalTypeInference::class]) suspend fun flowScope(block: @ExtensionFunctionType SuspendFunction1): R { TODO() } -suspend inline fun Flow.collect(crossinline action: SuspendFunction1<@ParameterName(...) T, Unit>) { +suspend inline fun Flow.collect(crossinline action: SuspendFunction1<@ParameterName(name = "value") T, Unit>) { } open class ChannelCoroutine { @@ -140,7 +140,7 @@ interface ReceiveChannel { } -@OptIn(...) +@OptIn(markerClass = [ExperimentalTypeInference::class]) fun CoroutineScope.produce(block: @ExtensionFunctionType SuspendFunction1, Unit>): ReceiveChannel { TODO() } diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt index 4c62f03f9b8..5e2c7daf623 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInDestructuringAssignment.kt.txt @@ -68,35 +68,35 @@ fun test1() { fun test2() { // COMPOSITE { - val tmp0_container: @FlexibleNullability Q<@NotNull(...) @EnhancedNullability String, @NotNull(...) @EnhancedNullability String>? = notNullComponents() - val x: @NotNull(...) @EnhancedNullability String = tmp0_container /*!! Q<@NotNull(...) @EnhancedNullability String, @NotNull(...) @EnhancedNullability String> */.component1() - val y: @NotNull(...) @EnhancedNullability String = tmp0_container /*!! Q<@NotNull(...) @EnhancedNullability String, @NotNull(...) @EnhancedNullability String> */.component2() + val tmp0_container: @FlexibleNullability Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String>? = notNullComponents() + val x: @NotNull() @EnhancedNullability String = tmp0_container /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component1() + val y: @NotNull() @EnhancedNullability String = tmp0_container /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component2() // } - use(x = x /*!! @NotNull(...) String */, y = y /*!! @NotNull(...) String */) + use(x = x /*!! @NotNull() String */, y = y /*!! @NotNull() String */) } fun test2Desugared() { - val tmp: @FlexibleNullability Q<@NotNull(...) @EnhancedNullability String, @NotNull(...) @EnhancedNullability String>? = notNullComponents() - val x: @NotNull(...) String = tmp /*!! Q<@NotNull(...) @EnhancedNullability String, @NotNull(...) @EnhancedNullability String> */.component1() /*!! @NotNull(...) String */ - val y: @NotNull(...) String = tmp /*!! Q<@NotNull(...) @EnhancedNullability String, @NotNull(...) @EnhancedNullability String> */.component2() /*!! @NotNull(...) String */ + val tmp: @FlexibleNullability Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String>? = notNullComponents() + val x: @NotNull() String = tmp /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component1() /*!! @NotNull() String */ + val y: @NotNull() String = tmp /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component2() /*!! @NotNull() String */ use(x = x, y = y) } fun test3() { // COMPOSITE { - val tmp0_container: @EnhancedNullability Q<@NotNull(...) @EnhancedNullability String, @NotNull(...) @EnhancedNullability String> = notNullQAndComponents() - val x: @NotNull(...) @EnhancedNullability String = tmp0_container /*!! Q<@NotNull(...) @EnhancedNullability String, @NotNull(...) @EnhancedNullability String> */.component1() - val y: @NotNull(...) @EnhancedNullability String = tmp0_container /*!! Q<@NotNull(...) @EnhancedNullability String, @NotNull(...) @EnhancedNullability String> */.component2() + val tmp0_container: @EnhancedNullability Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> = notNullQAndComponents() + val x: @NotNull() @EnhancedNullability String = tmp0_container /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component1() + val y: @NotNull() @EnhancedNullability String = tmp0_container /*!! Q<@NotNull() @EnhancedNullability String, @NotNull() @EnhancedNullability String> */.component2() // } - use(x = x /*!! @NotNull(...) String */, y = y /*!! @NotNull(...) String */) + use(x = x /*!! @NotNull() String */, y = y /*!! @NotNull() String */) } fun test4() { // COMPOSITE { - val tmp0_container: IndexedValue<@NotNull(...) @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull(...) @EnhancedNullability P> */.withIndex<@NotNull(...) @EnhancedNullability P>().first>() + val tmp0_container: IndexedValue<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */.withIndex<@NotNull() @EnhancedNullability P>().first>() val x: Int = tmp0_container.component1() - val y: @NotNull(...) @EnhancedNullability P = tmp0_container.component2() + val y: @NotNull() @EnhancedNullability P = tmp0_container.component2() // } - use(x = x, y = y /*!! @NotNull(...) P */) + use(x = x, y = y /*!! @NotNull() P */) } diff --git a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt index ac107a86453..3426a07de12 100644 --- a/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt +++ b/compiler/testData/ir/irText/types/nullChecks/enhancedNullabilityInForLoop.kt.txt @@ -3,9 +3,9 @@ fun use(s: P) { fun testForInListUnused() { { // BLOCK - val tmp0_iterator: MutableIterator<@NotNull(...) @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull(...) @EnhancedNullability P> */ /*as MutableList<*> */.iterator() + val tmp0_iterator: MutableIterator<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */ /*as MutableList<*> */.iterator() while (tmp0_iterator.hasNext()) { // BLOCK - val x: @NotNull(...) @EnhancedNullability P = tmp0_iterator.next() + val x: @NotNull() @EnhancedNullability P = tmp0_iterator.next() { // BLOCK } } @@ -14,11 +14,11 @@ fun testForInListUnused() { fun testForInListDestructured() { { // BLOCK - val tmp0_iterator: MutableIterator<@NotNull(...) @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull(...) @EnhancedNullability P> */ /*as MutableList<*> */.iterator() + val tmp0_iterator: MutableIterator<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */ /*as MutableList<*> */.iterator() while (tmp0_iterator.hasNext()) { // BLOCK - val tmp1_loop_parameter: @NotNull(...) @EnhancedNullability P = tmp0_iterator.next() - val x: Int = tmp1_loop_parameter /*!! @NotNull(...) P */.component1() - val y: Int = tmp1_loop_parameter /*!! @NotNull(...) P */.component2() + val tmp1_loop_parameter: @NotNull() @EnhancedNullability P = tmp0_iterator.next() + val x: Int = tmp1_loop_parameter /*!! @NotNull() P */.component1() + val y: Int = tmp1_loop_parameter /*!! @NotNull() P */.component2() { // BLOCK } } @@ -26,9 +26,9 @@ fun testForInListDestructured() { } fun testDesugaredForInList() { - val iterator: MutableIterator<@NotNull(...) @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull(...) @EnhancedNullability P> */ /*as MutableList<*> */.iterator() + val iterator: MutableIterator<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */ /*as MutableList<*> */.iterator() while (iterator.hasNext()) { // BLOCK - val x: @NotNull(...) P = iterator.next() /*!! @NotNull(...) P */ + val x: @NotNull() P = iterator.next() /*!! @NotNull() P */ } } @@ -45,11 +45,11 @@ fun testForInArrayUnused(j: J) { fun testForInListUse() { { // BLOCK - val tmp0_iterator: MutableIterator<@NotNull(...) @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull(...) @EnhancedNullability P> */ /*as MutableList<*> */.iterator() + val tmp0_iterator: MutableIterator<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */ /*as MutableList<*> */.iterator() while (tmp0_iterator.hasNext()) { // BLOCK - val x: @NotNull(...) @EnhancedNullability P = tmp0_iterator.next() + val x: @NotNull() @EnhancedNullability P = tmp0_iterator.next() { // BLOCK - use(s = x /*!! @NotNull(...) P */) + use(s = x /*!! @NotNull() P */) use(s = x) } }