[IR] update testdata: print arguments for annotations

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()
   }

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() {
 }
 

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() {
 }
 

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() {
 }
 

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() {
 }
 

compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.kt.txt

@@ -21,7 +21,7 @@ class C {
 
 }
 
-@A(...)
+@A(klass = C::class)
 fun test1() {
 }
 

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<TestEnum> {
   private constructor() /* primary */ {
     TODO("IrEnumConstructorCall")
@@ -88,7 +88,7 @@ enum class TestEnum : Enum<TestEnum> {
 
 }
 
-@TestAnn(...)
+@TestAnn(x = "annotation")
 annotation class TestAnnotation : Annotation {
   constructor() /* primary */ 
 

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() {
 }
 

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")
   }

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(<set-?>: Int) {
     return #test2$delegate.setValue(thisRef = null, kProp = ::test2, newValue = <set-?>)
   }

compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.kt.txt

@@ -16,8 +16,8 @@ open enum class TestEnum : Enum<TestEnum> {
 
   }
 
-  @TestAnn(...)
-  ENTRY1 init = TODO("IrEnumConstructorCall")  @TestAnn(...)
+  @TestAnn(x = "ENTRY1")
+  ENTRY1 init = TODO("IrEnumConstructorCall")  @TestAnn(x = "ENTRY2")
   ENTRY2 init = TODO("IrEnumConstructorCall")
 
 

compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.kt.txt

@@ -29,7 +29,7 @@ annotation class TestAnn : Annotation {
 
 }
 
-@TestAnn(...)
+@TestAnn(x = En)
 fun test1() {
 }
 

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

compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.kt.txt

@@ -9,7 +9,7 @@ annotation class TestAnn : Annotation {
 
 }
 
-@TestAnn(...)
+@TestAnn(x = 42)
 fun testSimpleFunction() {
 }
 

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() {
 }
 

compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.kt.txt

@@ -10,7 +10,7 @@ annotation class A : Annotation {
 }
 
 fun foo(m: Map<String, Int>) {
-  @A(...)
+  @A(x = "foo/test")
   val test: Int
     val test$delegate: Lazy<Int> = lazy<Int>(initializer =     local fun <anonymous>(): Int {
       return 42

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

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
 
 

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
 

compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.kt.txt

@@ -9,7 +9,7 @@ annotation class A : Annotation {
 
 }
 
-@A(...)
+@A(xs = [["a"], ["b"]])
 fun test() {
 }
 

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

compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.kt.txt

@@ -1,4 +1,4 @@
-@Target(...)
+@Target(allowedTargets = [AnnotationTarget])
 annotation class Anno : Annotation {
   constructor() /* primary */ 
 

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() {
 }
 

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"
 }
 

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

compiler/testData/ir/irText/declarations/fileWithAnnotations.kt.txt

@@ -1,4 +1,4 @@
-@file:JvmName(...)
+@file:JvmName(name = "FileWithAnnotations")
 
 fun foo() {
 }

compiler/testData/ir/irText/declarations/typeAlias.kt.txt

@@ -11,7 +11,7 @@ class C {
 
   }
 
-  @Suppress(...)
+  @Suppress(names = ["TOPLEVEL_TYPEALIASES_ONLY"])
   typealias TestNested = String
 
 

compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.kt.txt

@@ -100,7 +100,7 @@ fun test5(a: Any) {
   a as Function1<Int, Unit> /*~> 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))
   }
 }

compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall.kt.txt

@@ -4,6 +4,6 @@ fun test1(f: Function1<String, String>): C<@FlexibleNullability String?> {
 
 fun test2(x: Any) {
   x as Function1<String, String> /*~> 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 */
 }
 

compiler/testData/ir/irText/expressions/sam/samConversionInGenericConstructorCall_NI.kt.txt

@@ -44,6 +44,6 @@ fun testGenericJavaCtor1(f: Function1<String, Int>): G<@FlexibleNullability Stri
 
 fun testGenericJavaCtor2(x: Any) {
   x as Function1<String, Int> /*~> 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 */
 }
 

compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.kt.txt

@@ -26,7 +26,7 @@ fun test4(a: Any) {
 
 fun test5(a: Any) {
   a as Function1<String, String> /*~> 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 <T : Any?> test6(a: Function1<T, T>) {
@@ -35,7 +35,7 @@ fun <T : Any?> test6(a: Function1<T, T>) {
 
 fun <T : Any?> test7(a: Any) {
   a as Function1<T, T> /*~> 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<String, String>): J<@FlexibleNullability String?> {

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")

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()
 }

compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt

@@ -1,4 +1,4 @@
-@OptIn(...)
+@OptIn(markerClass = [ExperimentalTypeInference::class])
 fun <R : Any?> scopedFlow(block: @ExtensionFunctionType SuspendFunction2<CoroutineScope, FlowCollector<R>, Unit>): Flow<R> {
   return flow<R>(block =   local suspend fun FlowCollector<R>.<anonymous>() {
     val collector: FlowCollector<R> = <this>
@@ -10,7 +10,7 @@ fun <R : Any?> scopedFlow(block: @ExtensionFunctionType SuspendFunction2<Corouti
 )
 }
 
-fun <T : Any?> Flow<T>.onCompletion(action: @ExtensionFunctionType SuspendFunction2<FlowCollector<T>, @ParameterName(...) Throwable?, Unit>): Flow<T> {
+fun <T : Any?> Flow<T>.onCompletion(action: @ExtensionFunctionType SuspendFunction2<FlowCollector<T>, @ParameterName(name = "cause") Throwable?, Unit>): Flow<T> {
   return unsafeFlow<T>(block =   local suspend fun FlowCollector<T>.<anonymous>() {
     val safeCollector: SafeCollector<T> = SafeCollector<T>(collector = <this>)
     safeCollector.invokeSafely<T>(action = action)
@@ -18,16 +18,16 @@ fun <T : Any?> Flow<T>.onCompletion(action: @ExtensionFunctionType SuspendFuncti
 )
 }
 
-suspend fun <T : Any?> FlowCollector<T>.invokeSafely(action: @ExtensionFunctionType SuspendFunction2<FlowCollector<T>, @ParameterName(...) Throwable?, Unit>) {
+suspend fun <T : Any?> FlowCollector<T>.invokeSafely(action: @ExtensionFunctionType SuspendFunction2<FlowCollector<T>, @ParameterName(name = "cause") Throwable?, Unit>) {
 }
 
-@OptIn(...)
+@OptIn(markerClass = [ExperimentalTypeInference::class])
 inline fun <T : Any?> unsafeFlow(crossinline block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
   TODO()
 }
 
-@Deprecated(...)
-fun <T : Any?> Flow<T>.onCompletion(action: SuspendFunction1<@ParameterName(...) Throwable?, Unit>): Flow<T> {
+@Deprecated(message = "binary compatibility with a version w/o FlowCollector receiver", level = DeprecationLevel)
+fun <T : Any?> Flow<T>.onCompletion(action: SuspendFunction1<@ParameterName(name = "cause") Throwable?, Unit>): Flow<T> {
   return <this>.onCompletion<T>(action =   local suspend fun FlowCollector<T>.<anonymous>(it: Throwable?) {
     action.invoke(p1 = it)
   }
@@ -86,17 +86,17 @@ class SafeCollector<T : Any?> : FlowCollector<T> {
 
 }
 
-@OptIn(...)
+@OptIn(markerClass = [ExperimentalTypeInference::class])
 fun <T : Any?> flow(block: @ExtensionFunctionType SuspendFunction1<FlowCollector<T>, Unit>): Flow<T> {
   TODO()
 }
 
-@OptIn(...)
+@OptIn(markerClass = [ExperimentalTypeInference::class])
 suspend fun <R : Any?> flowScope(block: @ExtensionFunctionType SuspendFunction1<CoroutineScope, R>): R {
   TODO()
 }
 
-suspend inline fun <T : Any?> Flow<T>.collect(crossinline action: SuspendFunction1<@ParameterName(...) T, Unit>) {
+suspend inline fun <T : Any?> Flow<T>.collect(crossinline action: SuspendFunction1<@ParameterName(name = "value") T, Unit>) {
 }
 
 open class ChannelCoroutine<E : Any?> {
@@ -140,7 +140,7 @@ interface ReceiveChannel<out E : Any?> {
 
 }
 
-@OptIn(...)
+@OptIn(markerClass = [ExperimentalTypeInference::class])
 fun <E : Any?> CoroutineScope.produce(block: @ExtensionFunctionType SuspendFunction1<ProducerScope<E>, Unit>): ReceiveChannel<E> {
   TODO()
 }

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<IndexedValue<@NotNull(...) @EnhancedNullability P>>()
+  val tmp0_container: IndexedValue<@NotNull() @EnhancedNullability P> = listOfNotNull() /*!! List<@NotNull() @EnhancedNullability P> */.withIndex<@NotNull() @EnhancedNullability P>().first<IndexedValue<@NotNull() @EnhancedNullability P>>()
   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 */)
 }
 

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)
       }
     }