diff --git a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.fir.kt.txt b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.fir.kt.txt index 12ed623bf64..4861e83dbf8 100644 --- a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.fir.kt.txt @@ -34,7 +34,7 @@ class Test1 : IBase { (.#<$$delegate_0>, ).( = ) } - local /*final field*/ val <$$delegate_0>: IBase + local /* final field */ val <$$delegate_0>: IBase } @@ -68,6 +68,7 @@ class Test2 : IBase { (.#<$$delegate_0>, ).( = ) } - local /*final field*/ val <$$delegate_0>: IBase + local /* final field */ val <$$delegate_0>: IBase } + diff --git a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.kt.txt b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.kt.txt index ff81bef42ff..6b1ef416e02 100644 --- a/compiler/testData/ir/irText/classes/delegatedGenericImplementation.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedGenericImplementation.kt.txt @@ -16,7 +16,7 @@ class Test1 : IBase { } - private /*final field*/ val $$delegate_0: IBase = i + private /* final field */ val $$delegate_0: IBase = i override fun foo(a: E, b: B) { .#$$delegate_0.foo(a = a, b = b) } @@ -48,7 +48,7 @@ class Test2 : IBase { get set - private /*final field*/ val $$delegate_0: IBase = j + private /* final field */ val $$delegate_0: IBase = j override fun foo(a: String, b: B) { .#$$delegate_0.foo(a = a, b = b) } diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.kt.txt index ef0e829ad86..7d3062bf224 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.kt.txt @@ -97,7 +97,7 @@ class Test1 : IBase { (.#<$$delegate_0>, ).qux() } - local /*final field*/ val <$$delegate_0>: IBase + local /* final field */ val <$$delegate_0>: IBase } @@ -122,7 +122,7 @@ class Test2 : IBase, IOther { (.#<$$delegate_0>, ).qux() } - local /*final field*/ val <$$delegate_0>: IBase + local /* final field */ val <$$delegate_0>: IBase override val x: String override get(): String { return .#<$$delegate_1>.() @@ -149,6 +149,7 @@ class Test2 : IBase, IOther { (.#<$$delegate_1>, ).( = ) } - local /*final field*/ val <$$delegate_1>: IOther + local /* final field */ val <$$delegate_1>: IOther } + diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.kt.txt index 04bc27d486e..835c6190117 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.kt.txt @@ -84,7 +84,7 @@ class Test1 : IBase { } - private /*final field*/ val $$delegate_0: BaseImpl = BaseImpl + private /* final field */ val $$delegate_0: BaseImpl = BaseImpl override fun bar(): Int { return .#$$delegate_0.bar() } @@ -106,7 +106,7 @@ class Test2 : IBase, IOther { } - private /*final field*/ val $$delegate_0: BaseImpl = BaseImpl + private /* final field */ val $$delegate_0: BaseImpl = BaseImpl override fun bar(): Int { return .#$$delegate_0.bar() } @@ -119,7 +119,7 @@ class Test2 : IBase, IOther { (.#$$delegate_0, ).qux() } - private /*final field*/ val $$delegate_1: IOther = otherImpl(x0 = "", y0 = 42) + private /* final field */ val $$delegate_1: IOther = otherImpl(x0 = "", y0 = 42) override val Byte.z1: Int override get(): Int { return (.#$$delegate_1, ).() diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.fir.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.fir.kt.txt index 8bf95831780..99901f3782f 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementationOfJavaInterface.fir.kt.txt @@ -34,6 +34,7 @@ class Test : J { return .#<$$delegate_0>.returnsFlexible() } - local /*final field*/ val <$$delegate_0>: J + local /* final field */ val <$$delegate_0>: J } + diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.kt.txt index fba073af5c8..103c62d6993 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.kt.txt @@ -34,6 +34,7 @@ class C : IFooBar { .#<$$delegate_0>.foo() } - local /*final field*/ val <$$delegate_0>: IFooBar + local /* final field */ val <$$delegate_0>: IFooBar } + diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.kt.txt b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.kt.txt index 5cab352d2a5..97d4259efde 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.kt.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.kt.txt @@ -26,7 +26,7 @@ class C : IFooBar { } - private /*final field*/ val $$delegate_0: FooBarImpl = FooBarImpl + private /* final field */ val $$delegate_0: FooBarImpl = FooBarImpl override fun foo() { .#$$delegate_0.foo() } diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.kt.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.kt.txt index 8ae6aea8d38..154bbcaad18 100644 --- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.kt.txt +++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.fir.kt.txt @@ -59,7 +59,7 @@ class TestJFoo : IFoo { return .#<$$delegate_0>.foo() } - local /*final field*/ val <$$delegate_0>: IFoo + local /* final field */ val <$$delegate_0>: IFoo } @@ -75,7 +75,7 @@ class TestK1 : IFoo { return .#<$$delegate_0>.foo() } - local /*final field*/ val <$$delegate_0>: IFoo + local /* final field */ val <$$delegate_0>: IFoo } @@ -91,7 +91,7 @@ class TestK2 : IFoo { return .#<$$delegate_0>.foo() } - local /*final field*/ val <$$delegate_0>: IFoo + local /* final field */ val <$$delegate_0>: IFoo } @@ -107,7 +107,7 @@ class TestK3 : IFoo { return .#<$$delegate_0>.foo() } - local /*final field*/ val <$$delegate_0>: IFoo + local /* final field */ val <$$delegate_0>: IFoo } @@ -123,6 +123,7 @@ class TestK4 : IFoo { return .#<$$delegate_0>.foo() } - local /*final field*/ val <$$delegate_0>: IFoo + local /* final field */ val <$$delegate_0>: IFoo } + diff --git a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt index 380453eb62e..0d4907bc0c2 100644 --- a/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt +++ b/compiler/testData/ir/irText/classes/implicitNotNullOnDelegatedImplementation.kt.txt @@ -54,7 +54,7 @@ class TestJFoo : IFoo { } - private /*final field*/ val $$delegate_0: JFoo = JFoo() + private /* final field */ val $$delegate_0: JFoo = JFoo() override fun foo(): String { return .#$$delegate_0.foo() /*!! String */ } @@ -68,7 +68,7 @@ class TestK1 : IFoo { } - private /*final field*/ val $$delegate_0: K1 = K1() + private /* final field */ val $$delegate_0: K1 = K1() override fun foo(): String { return .#$$delegate_0.foo() /*!! String */ } @@ -82,7 +82,7 @@ class TestK2 : IFoo { } - private /*final field*/ val $$delegate_0: K2 = K2() + private /* final field */ val $$delegate_0: K2 = K2() override fun foo(): String { return .#$$delegate_0.foo() } @@ -96,7 +96,7 @@ class TestK3 : IFoo { } - private /*final field*/ val $$delegate_0: K3 = K3() + private /* final field */ val $$delegate_0: K3 = K3() override fun foo(): String { return .#$$delegate_0.foo() } @@ -110,7 +110,7 @@ class TestK4 : IFoo { } - private /*final field*/ val $$delegate_0: K4 = K4() + private /* final field */ val $$delegate_0: K4 = K4() override fun foo(): String { return .#$$delegate_0.foo() /*!! String */ } diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.fir.kt.txt index 5d627c4940a..45bfc22d9b2 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.fir.kt.txt @@ -45,6 +45,7 @@ class DFoo : IFoo { return (.#<$$delegate_0>, ).() } - local /*final field*/ val <$$delegate_0>: IFoo + local /* final field */ val <$$delegate_0>: IFoo } + diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt.txt index 0cab97fc9e0..02c4a0f9c9d 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsOnDelegatedMembers.kt.txt @@ -26,7 +26,7 @@ class DFoo : IFoo { } - private /*final field*/ val $$delegate_0: IFoo = d + private /* final field */ val $$delegate_0: IFoo = d @Ann override fun String.testExtFun() { (.#$$delegate_0, ).testExtFun() diff --git a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.fir.kt.txt b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.fir.kt.txt index f2c20e552fc..af0e0ee01ba 100644 --- a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.fir.kt.txt @@ -31,7 +31,7 @@ class Delegated : IFoo { return (.#<$$delegate_0>, ).() } - local /*final field*/ val <$$delegate_0>: IFoo + local /* final field */ val <$$delegate_0>: IFoo } @@ -62,3 +62,4 @@ class ExplicitOverride : IFoo { } } + diff --git a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt.txt b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt.txt index e8c7b83bd78..d6384c5dbde 100644 --- a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt.txt +++ b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.kt.txt @@ -20,7 +20,7 @@ class Delegated : IFoo { } - private /*final field*/ val $$delegate_0: IFoo = foo + private /* final field */ val $$delegate_0: IFoo = foo override val String.extProp: String override get(): String { return (.#$$delegate_0, ).() diff --git a/compiler/testData/ir/irText/declarations/kt35550.fir.kt.txt b/compiler/testData/ir/irText/declarations/kt35550.fir.kt.txt index 7ed89add857..ec35a44d722 100644 --- a/compiler/testData/ir/irText/declarations/kt35550.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/kt35550.fir.kt.txt @@ -19,6 +19,7 @@ class A : I { return (.#<$$delegate_0>, ).() } - local /*final field*/ val <$$delegate_0>: I + local /* final field */ val <$$delegate_0>: I } + diff --git a/compiler/testData/ir/irText/declarations/kt35550.kt.txt b/compiler/testData/ir/irText/declarations/kt35550.kt.txt index 2b8de3d0ff5..1b3af7b5e9e 100644 --- a/compiler/testData/ir/irText/declarations/kt35550.kt.txt +++ b/compiler/testData/ir/irText/declarations/kt35550.kt.txt @@ -13,7 +13,7 @@ class A : I { } - private /*final field*/ val $$delegate_0: I = i + private /* final field */ val $$delegate_0: I = i override val T.id: T override get(): T { return (.#$$delegate_0, ).() diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.kt.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.kt.txt index f8509a6c22c..2ea28d408b8 100644 --- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.kt.txt +++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.kt.txt @@ -28,6 +28,7 @@ class Test : IBase { return .#<$$delegate_0>.() } - local /*final field*/ val <$$delegate_0>: IBase + local /* final field */ val <$$delegate_0>: IBase } + diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.kt.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.kt.txt index df3fbee5830..b6e22e18e72 100644 --- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.kt.txt +++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.kt.txt @@ -14,7 +14,7 @@ class Test : IBase { } - private /*final field*/ val $$delegate_0: IBase = impl + private /* final field */ val $$delegate_0: IBase = impl override fun qux(t: TT, x: X) { .#$$delegate_0.qux(t = t, x = x) } diff --git a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.fir.kt.txt b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.fir.kt.txt index fca16e0cd8d..cf7ebc19190 100644 --- a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.fir.kt.txt @@ -51,10 +51,11 @@ class Impl : A, B { return .#<$$delegate_0>.() } - local /*final field*/ val <$$delegate_0>: B + local /* final field */ val <$$delegate_0>: B } fun box(): String { return "OK" } + diff --git a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt.txt b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt.txt index e9bbd371094..1831c10784a 100644 --- a/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt.txt +++ b/compiler/testData/ir/irText/firProblems/DelegationAndInheritanceFromJava.kt.txt @@ -5,7 +5,7 @@ class Impl : A, B { } - private /*final field*/ val $$delegate_0: B = b + private /* final field */ val $$delegate_0: B = b override fun add(element: @FlexibleNullability String?): Boolean { return .#$$delegate_0.add(element = element) } diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt index 30ecc73057c..cf0380f32ae 100644 --- a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt +++ b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.kt.txt @@ -53,7 +53,7 @@ data class DataClass : Derived, Delegate { .#<$$delegate_0>.bar() } - local /*final field*/ val <$$delegate_0>: Delegate + local /* final field */ val <$$delegate_0>: Delegate override fun equals(other: Any?): Boolean { when { EQEQEQ(arg0 = , arg1 = other) -> return true @@ -77,3 +77,4 @@ data class DataClass : Derived, Delegate { } } + diff --git a/compiler/testData/ir/irText/types/javaWildcardType.fir.kt.txt b/compiler/testData/ir/irText/types/javaWildcardType.fir.kt.txt index cf408d1cdea..f497b74edb0 100644 --- a/compiler/testData/ir/irText/types/javaWildcardType.fir.kt.txt +++ b/compiler/testData/ir/irText/types/javaWildcardType.fir.kt.txt @@ -31,7 +31,7 @@ class C : J, K { .#<$$delegate_0>.jg2(c = c) } - local /*final field*/ val <$$delegate_0>: J + local /* final field */ val <$$delegate_0>: J override fun kf1(): Collection { return .#<$$delegate_1>.kf1() } @@ -48,6 +48,7 @@ class C : J, K { .#<$$delegate_1>.kg2(c = c) } - local /*final field*/ val <$$delegate_1>: K + local /* final field */ val <$$delegate_1>: K } + diff --git a/compiler/testData/ir/irText/types/javaWildcardType.kt.txt b/compiler/testData/ir/irText/types/javaWildcardType.kt.txt index f4e9ce282a2..e5ad5568f40 100644 --- a/compiler/testData/ir/irText/types/javaWildcardType.kt.txt +++ b/compiler/testData/ir/irText/types/javaWildcardType.kt.txt @@ -13,7 +13,7 @@ class C : J, K { } - private /*final field*/ val $$delegate_0: J = j + private /* final field */ val $$delegate_0: J = j override fun jf1(): @FlexibleNullability MutableCollection? { return .#$$delegate_0.jf1() } @@ -30,7 +30,7 @@ class C : J, K { .#$$delegate_0.jg2(c = c) } - private /*final field*/ val $$delegate_1: K = k + private /* final field */ val $$delegate_1: K = k override fun kf1(): Collection { return .#$$delegate_1.kf1() } diff --git a/compiler/testData/ir/irText/types/rawTypeInSignature.fir.kt.txt b/compiler/testData/ir/irText/types/rawTypeInSignature.fir.kt.txt index 3494329f26d..0c810163b36 100644 --- a/compiler/testData/ir/irText/types/rawTypeInSignature.fir.kt.txt +++ b/compiler/testData/ir/irText/types/rawTypeInSignature.fir.kt.txt @@ -77,6 +77,7 @@ class KRaw : JRaw { return .#<$$delegate_0>.returnsRawGenericOut() } - local /*final field*/ val <$$delegate_0>: JRaw + local /* final field */ val <$$delegate_0>: JRaw } + diff --git a/compiler/testData/ir/irText/types/rawTypeInSignature.kt.txt b/compiler/testData/ir/irText/types/rawTypeInSignature.kt.txt index b091d11a5c9..d39267cfd70 100644 --- a/compiler/testData/ir/irText/types/rawTypeInSignature.kt.txt +++ b/compiler/testData/ir/irText/types/rawTypeInSignature.kt.txt @@ -44,7 +44,7 @@ class KRaw : JRaw { } - private /*final field*/ val $$delegate_0: JRaw = j + private /* final field */ val $$delegate_0: JRaw = j override fun returnsRawGenericIn(): @FlexibleNullability @RawType GenericIn? { return .#$$delegate_0.returnsRawGenericIn() }