FirRenderer: slightly change/refactor declaration rendering

2022-07-08 17:13:24 +02:00
parent ac34fe3306
commit 7ce5100946
45 changed files with 330 additions and 329 deletions
@@ -8,7 +8,7 @@ FILE: class.kt
        }
        private final [BODY_RESOLVE] val y: <ERROR TYPE REF: Symbol not found for C> = this@R|/B|.R|/B.q|()
-            [BODY_RESOLVE] private get(): <ERROR TYPE REF: Symbol not found for C>
+            private [BODY_RESOLVE] get(): <ERROR TYPE REF: Symbol not found for C>
        public final [BODY_RESOLVE] fun foo([BODY_RESOLVE] a: <ERROR TYPE REF: Symbol not found for A>): <ERROR TYPE REF: Cannot infer argument for type parameter R> {
            ^foo <Inapplicable(INAPPLICABLE): kotlin/with>#<R|ERROR CLASS: Cannot infer argument for type parameter T|, R|ERROR CLASS: Cannot infer argument for type parameter R|>(R|<local>/a|, <L> = [BODY_RESOLVE] with@fun <ERROR TYPE REF: Cannot infer argument for type parameter T>.<anonymous>(): <ERROR TYPE REF: Cannot infer argument for type parameter R> <inline=Unknown, kind=EXACTLY_ONCE>  {
@@ -5,6 +5,6 @@ FILE: constructorParameter.kt
        }
        public final [BODY_RESOLVE] val x: R|kotlin/String| = R|<local>/x|
-            [BODY_RESOLVE] public get(): R|kotlin/String|
+            public [BODY_RESOLVE] get(): R|kotlin/String|
    }
@@ -5,7 +5,7 @@ FILE: enum.kt
        }
        public final [BODY_RESOLVE] val x: R|kotlin/Int| = R|<local>/x|
-            [BODY_RESOLVE] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] get(): R|kotlin/Int|
        public final static [BODY_RESOLVE] enum entry A: R|Enum| = object : R|Enum| {
            private [BODY_RESOLVE] constructor(): R|<anonymous>| {
@@ -3,4 +3,4 @@ FILE: functionWithImplicitType.kt
        ^checkSubtype R|<local>/t|
    }
    public final [BODY_RESOLVE] val ab: R|kotlin/collections/List<kotlin/Int>?| = R|/checkSubtype|<R|kotlin/collections/List<kotlin/Int>?|>(Q|java/util/Collections|.R|java/util/Collections.emptyList|<R|kotlin/Int|>())
-        [BODY_RESOLVE] public get(): R|kotlin/collections/List<kotlin/Int>?|
+        public [BODY_RESOLVE] get(): R|kotlin/collections/List<kotlin/Int>?|
@@ -11,7 +11,7 @@ FILE: lambdaInImplicitPropertyBody.kt
        }
        public final [BODY_RESOLVE] val a: R|kotlin/Int| = Int(10)
-            [BODY_RESOLVE] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] get(): R|kotlin/Int|
        public final [BODY_RESOLVE] val x: R|kotlin/String| = R|/with|<R|kotlin/Int|, R|kotlin/String|>(this@R|/B|.R|/B.a|, <L> = [BODY_RESOLVE] with@fun R|kotlin/Int|.<anonymous>(): R|kotlin/String| <inline=Inline, kind=UNKNOWN>  {
            ^ this@R|special/anonymous|.R|kotlin/Int.toString|().R|/let|<R|kotlin/String|, R|kotlin/String|>(<L> = [BODY_RESOLVE] let@fun <anonymous>([BODY_RESOLVE] it: R|kotlin/String|): R|kotlin/String| <inline=Inline, kind=UNKNOWN>  {
@@ -20,6 +20,6 @@ FILE: lambdaInImplicitPropertyBody.kt
            )
        }
        )
-            [BODY_RESOLVE] public get(): R|kotlin/String|
+            public [BODY_RESOLVE] get(): R|kotlin/String|
    }
@@ -1,8 +1,8 @@
 FILE: propertyWithGetterAndSetter.kt
    public final [BODY_RESOLVE] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-        [BODY_RESOLVE] public get(): R|kotlin/Int| {
+        public [BODY_RESOLVE] get(): R|kotlin/Int| {
            ^ F|/withGetterAndSetter|
        }
-        [BODY_RESOLVE] public set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public [BODY_RESOLVE] set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
            F|/withGetterAndSetter| = R|<local>/value|
        }
@@ -5,8 +5,8 @@ FILE: propertyWithSetter.kt
        }
        public abstract [BODY_RESOLVE] var id: R|kotlin/Int|
-            [BODY_RESOLVE] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] get(): R|kotlin/Int|
-            [BODY_RESOLVE] protected set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit|
+            protected [BODY_RESOLVE] set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit|
    }
    public final [BODY_RESOLVE] class Bar : R|Foo| {
@@ -15,8 +15,8 @@ FILE: propertyWithSetter.kt
        }
        public final override [BODY_RESOLVE] var id: R|kotlin/Int| = Int(1)
-            [BODY_RESOLVE] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] get(): R|kotlin/Int|
-            [BODY_RESOLVE] public set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit|
+            public [BODY_RESOLVE] set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit|
    }
    public final [BODY_RESOLVE] fun test(): R|kotlin/Unit| {
@@ -20,7 +20,7 @@ FILE: annotationParameters.kt
        }
        public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public? final? [RAW_FIR] class B : R|kotlin/Any| {
@@ -55,7 +55,7 @@ FILE: annotationParameters.kt
        }
        public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public? final? [RAW_FIR] class B : R|kotlin/Any| {
@@ -90,7 +90,7 @@ FILE: annotationParameters.kt
        }
        public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public? final? [RAW_FIR] class B : R|kotlin/Any| {
@@ -125,7 +125,7 @@ FILE: annotationParameters.kt
        }
        public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public? final? [RAW_FIR] class B : R|kotlin/Any| {
@@ -160,7 +160,7 @@ FILE: annotationParameters.kt
        }
        public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public? final? [RAW_FIR] class B : R|kotlin/Any| {
@@ -195,7 +195,7 @@ FILE: annotationParameters.kt
        }
        public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public? final? [SUPER_TYPES] class B : R|kotlin/Any| {
@@ -230,7 +230,7 @@ FILE: annotationParameters.kt
        }
        public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public final [SUPER_TYPES] class B : R|kotlin/Any| {
@@ -265,7 +265,7 @@ FILE: annotationParameters.kt
        }
        public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public final [SUPER_TYPES] class B : R|kotlin/Any| {
@@ -300,7 +300,7 @@ FILE: annotationParameters.kt
        }
        public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public final [SUPER_TYPES] class B : R|kotlin/Any| {
@@ -336,7 +336,7 @@ FILE: annotationParameters.kt
        }
        public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public final [STATUS] class B : R|kotlin/Any| {
@@ -372,7 +372,7 @@ FILE: annotationParameters.kt
        }
        public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public final [STATUS] class B : R|kotlin/Any| {
@@ -408,7 +408,7 @@ FILE: annotationParameters.kt
        }
        public? final? [SUPER_TYPES] [IsFromPrimaryConstructor=true] val args: A.X = R|<local>/args|
-            [TYPES] [ContainingClassKey=Anno] public? get(): A.X
+            public? [TYPES] [ContainingClassKey=Anno] get(): A.X
    }
    public final [STATUS] class B : R|kotlin/Any| {
@@ -444,7 +444,7 @@ FILE: annotationParameters.kt
        }
        public final [BODY_RESOLVE] [IsFromPrimaryConstructor=true] val args: <ERROR TYPE REF: Symbol not found for A.X> = R|<local>/args|
-            [BODY_RESOLVE] [ContainingClassKey=Anno] public get(): <ERROR TYPE REF: Symbol not found for A.X>
+            public [BODY_RESOLVE] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for A.X>
    }
    public final [BODY_RESOLVE] class B : R|kotlin/Any| {
@@ -9,7 +9,7 @@ FILE: classMembers.kt
        public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
        public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION
-            [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK }
+            public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK }
        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK }
@@ -27,7 +27,7 @@ FILE: classMembers.kt
        public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
        public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION
-            [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK }
+            public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK }
        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK }
@@ -45,7 +45,7 @@ FILE: classMembers.kt
        public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
        public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION
-            [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK }
+            public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK }
        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK }
@@ -63,7 +63,7 @@ FILE: classMembers.kt
        public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
        public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION
-            [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK }
+            public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK }
        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK }
@@ -81,7 +81,7 @@ FILE: classMembers.kt
        public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
        public? final? [RAW_FIR] val x: Int = LAZY_EXPRESSION
-            [RAW_FIR] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK }
+            public? [RAW_FIR] [ContainingClassKey=A] get(): Int { LAZY_BLOCK }
        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK }
@@ -99,7 +99,7 @@ FILE: classMembers.kt
        public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
        public? final? [SUPER_TYPES] val x: Int = LAZY_EXPRESSION
-            [SUPER_TYPES] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK }
+            public? [SUPER_TYPES] [ContainingClassKey=A] get(): Int { LAZY_BLOCK }
        public? final? [SUPER_TYPES] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK }
@@ -117,7 +117,7 @@ FILE: classMembers.kt
        public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
        public? final? [SUPER_TYPES] val x: Int = LAZY_EXPRESSION
-            [SUPER_TYPES] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK }
+            public? [SUPER_TYPES] [ContainingClassKey=A] get(): Int { LAZY_BLOCK }
        public? final? [SUPER_TYPES] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK }
@@ -135,7 +135,7 @@ FILE: classMembers.kt
        public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
        public? final? [SUPER_TYPES] val x: Int = LAZY_EXPRESSION
-            [SUPER_TYPES] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK }
+            public? [SUPER_TYPES] [ContainingClassKey=A] get(): Int { LAZY_BLOCK }
        public? final? [SUPER_TYPES] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK }
@@ -155,7 +155,7 @@ FILE: classMembers.kt
        }
        public? final? [SUPER_TYPES] val x: Int = LAZY_EXPRESSION
-            [SUPER_TYPES] [ContainingClassKey=A] public? get(): Int { LAZY_BLOCK }
+            public? [SUPER_TYPES] [ContainingClassKey=A] get(): Int { LAZY_BLOCK }
        public? final? [SUPER_TYPES] fun receive([RAW_FIR] value: String): R|kotlin/Unit| { LAZY_BLOCK }
@@ -175,7 +175,7 @@ FILE: classMembers.kt
        }
        public final [STATUS] val x: R|kotlin/Int| = LAZY_EXPRESSION
-            [STATUS] [ContainingClassKey=A] public get(): R|kotlin/Int| { LAZY_BLOCK }
+            public [STATUS] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
        public final [STATUS] fun receive([RAW_FIR] value: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
@@ -195,7 +195,7 @@ FILE: classMembers.kt
        }
        public final [STATUS] val x: R|kotlin/Int| = LAZY_EXPRESSION
-            [STATUS] [ContainingClassKey=A] public get(): R|kotlin/Int| { LAZY_BLOCK }
+            public [STATUS] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
        public final [STATUS] fun receive([RAW_FIR] value: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK }
@@ -215,7 +215,7 @@ FILE: classMembers.kt
        }
        public final [STATUS] val x: R|kotlin/Int| = LAZY_EXPRESSION
-            [STATUS] [ContainingClassKey=A] public get(): R|kotlin/Int| { LAZY_BLOCK }
+            public [STATUS] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK }
        public final [CONTRACTS] fun receive([RAW_FIR] value: R|kotlin/String|): R|kotlin/Unit| {
        }
@@ -238,7 +238,7 @@ FILE: classMembers.kt
        }
        public final [BODY_RESOLVE] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-            [BODY_RESOLVE] [ContainingClassKey=A] public get(): R|kotlin/Int| {
+            public [BODY_RESOLVE] [ContainingClassKey=A] get(): R|kotlin/Int| {
                ^ this@R|/A|.F|/A.x|
            }
@@ -4,27 +4,27 @@ FILE: delegates.kt
    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -33,27 +33,27 @@ FILE: delegates.kt
    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -62,27 +62,27 @@ FILE: delegates.kt
    public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -91,27 +91,27 @@ FILE: delegates.kt
    public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -120,27 +120,27 @@ FILE: delegates.kt
    public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -149,27 +149,27 @@ FILE: delegates.kt
    public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -178,27 +178,27 @@ FILE: delegates.kt
    public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -207,27 +207,27 @@ FILE: delegates.kt
    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -241,27 +241,27 @@ FILE: delegates.kt
    }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -275,27 +275,27 @@ FILE: delegates.kt
    }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -309,27 +309,27 @@ FILE: delegates.kt
    }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val delegate: <implicit> = LAZY_EXPRESSION
-        [TYPES] public? get(): <implicit>
+        public? [TYPES] get(): <implicit>
    public? final? [RAW_FIR] val valueWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
        }
    public? final? [RAW_FIR] var variableWithExplicitType: Intby LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by LAZY_EXPRESSION
-        [RAW_FIR] public? get(): <implicit> {
+        public? [RAW_FIR] get(): <implicit> {
            ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
        }
-        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public? [RAW_FIR] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -357,27 +357,27 @@ FILE: delegates.kt
    }
-        [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
+        public [BODY_RESOLVE] get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
    public final [CONTRACTS] val valueWithExplicitType: R|kotlin/Int|by delegate#
-        [CONTRACTS] public get(): <implicit> {
+        public [CONTRACTS] get(): <implicit> {
            ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
        }
    public final [IMPLICIT_TYPES_BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
-        [IMPLICIT_TYPES_BODY_RESOLVE] public get(): R|kotlin/Int| {
+        public [IMPLICIT_TYPES_BODY_RESOLVE] get(): R|kotlin/Int| {
            ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
        }
    public final [CONTRACTS] var variableWithExplicitType: R|kotlin/Int|by delegate#
-        [CONTRACTS] public get(): <implicit> {
+        public [CONTRACTS] get(): <implicit> {
            ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
        }
-        [CONTRACTS] public set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
+        public [CONTRACTS] set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
            D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public final [IMPLICIT_TYPES_BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
-        [IMPLICIT_TYPES_BODY_RESOLVE] public get(): R|kotlin/Int| {
+        public [IMPLICIT_TYPES_BODY_RESOLVE] get(): R|kotlin/Int| {
            ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
        }
-        [IMPLICIT_TYPES_BODY_RESOLVE] public set([RAW_FIR] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        public [IMPLICIT_TYPES_BODY_RESOLVE] set([RAW_FIR] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
            D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -405,26 +405,26 @@ FILE: delegates.kt
    }
-        [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
+        public [BODY_RESOLVE] get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
    public final [BODY_RESOLVE] val valueWithExplicitType: R|kotlin/Int|by R|/delegate|
-        [BODY_RESOLVE] public get(): R|kotlin/Int| {
+        public [BODY_RESOLVE] get(): R|kotlin/Int| {
            ^ D|/valueWithExplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithExplicitType|)
        }
    public final [BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
-        [BODY_RESOLVE] public get(): R|kotlin/Int| {
+        public [BODY_RESOLVE] get(): R|kotlin/Int| {
            ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
        }
    public final [BODY_RESOLVE] var variableWithExplicitType: R|kotlin/Int|by R|/delegate|
-        [BODY_RESOLVE] public get(): R|kotlin/Int| {
+        public [BODY_RESOLVE] get(): R|kotlin/Int| {
            ^ D|/variableWithExplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithExplicitType|)
        }
-        [BODY_RESOLVE] public set([BODY_RESOLVE] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        public [BODY_RESOLVE] set([BODY_RESOLVE] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
            D|/variableWithExplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
        }
    public final [BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
-        [BODY_RESOLVE] public get(): R|kotlin/Int| {
+        public [BODY_RESOLVE] get(): R|kotlin/Int| {
            ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
        }
-        [BODY_RESOLVE] public set([BODY_RESOLVE] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        public [BODY_RESOLVE] set([BODY_RESOLVE] <set-?>: R|kotlin/Int|): R|kotlin/Unit| {
            D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.setValue: R|kotlin/Unit|>|(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
        }
@@ -7,8 +7,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION
-            [TYPES] [ContainingClassKey=X] public? get(): Int
+            public? [TYPES] [ContainingClassKey=X] get(): Int
-            [RAW_FIR] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+            public? [RAW_FIR] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
    }
@@ -20,8 +20,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION
-            [TYPES] [ContainingClassKey=X] public? get(): Int
+            public? [TYPES] [ContainingClassKey=X] get(): Int
-            [RAW_FIR] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+            public? [RAW_FIR] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
    }
@@ -33,8 +33,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public? final? [COMPILER_REQUIRED_ANNOTATIONS] var x: Int = LAZY_EXPRESSION
-            [TYPES] [ContainingClassKey=X] public? get(): Int
+            public? [TYPES] [ContainingClassKey=X] get(): Int
-            [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+            public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
    }
@@ -46,8 +46,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public? final? [COMPANION_GENERATION] var x: Int = LAZY_EXPRESSION
-            [TYPES] [ContainingClassKey=X] public? get(): Int
+            public? [TYPES] [ContainingClassKey=X] get(): Int
-            [COMPANION_GENERATION] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+            public? [COMPANION_GENERATION] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
    }
@@ -59,8 +59,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public? final? [SUPER_TYPES] var x: Int = LAZY_EXPRESSION
-            [TYPES] [ContainingClassKey=X] public? get(): Int
+            public? [TYPES] [ContainingClassKey=X] get(): Int
-            [SUPER_TYPES] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+            public? [SUPER_TYPES] [ContainingClassKey=X] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
    }
@@ -72,8 +72,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public? final? [TYPES] var x: R|kotlin/Int| = LAZY_EXPRESSION
-            [TYPES] [ContainingClassKey=X] public? get(): R|kotlin/Int|
+            public? [TYPES] [ContainingClassKey=X] get(): R|kotlin/Int|
-            [TYPES] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
+            public? [TYPES] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
    }
@@ -85,8 +85,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public final [STATUS] var x: R|kotlin/Int| = LAZY_EXPRESSION
-            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int|
-            [STATUS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
+            public [STATUS] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
    }
@@ -98,8 +98,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public final [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = LAZY_EXPRESSION
-            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int|
-            [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
+            public [ARGUMENTS_OF_ANNOTATIONS] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
    }
@@ -111,8 +111,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public final [CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int|
-            [CONTRACTS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public [CONTRACTS] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                ^ Unit#
            }
@@ -126,8 +126,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public final [IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int|
-            [IMPLICIT_TYPES_BODY_RESOLVE] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public [IMPLICIT_TYPES_BODY_RESOLVE] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                ^ Unit#
            }
@@ -141,8 +141,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public final [EXPECT_ACTUAL_MATCHING] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int|
-            [EXPECT_ACTUAL_MATCHING] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public [EXPECT_ACTUAL_MATCHING] [ContainingClassKey=X] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                ^ Unit#
            }
@@ -156,8 +156,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int|
-            [BODY_RESOLVE] [ContainingClassKey=X] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public [BODY_RESOLVE] [ContainingClassKey=X] set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                ^ Q|kotlin/Unit|
            }
@@ -171,8 +171,8 @@ FILE: parameterOfNonLocalSetter.kt
        }
        public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            public [BODY_RESOLVE] [ContainingClassKey=X] get(): R|kotlin/Int|
-            [BODY_RESOLVE] [ContainingClassKey=X] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public [BODY_RESOLVE] [ContainingClassKey=X] set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                ^ Q|kotlin/Unit|
            }
@@ -4,56 +4,56 @@ FILE: propertyWithGetter.kt
    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 IMPORTS:
 FILE: propertyWithGetter.kt
    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: propertyWithGetter.kt
    public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 COMPANION_GENERATION:
 FILE: propertyWithGetter.kt
    public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 SUPER_TYPES:
 FILE: propertyWithGetter.kt
    public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 TYPES:
 FILE: propertyWithGetter.kt
    public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 STATUS:
 FILE: propertyWithGetter.kt
    public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: propertyWithGetter.kt
    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 CONTRACTS:
 FILE: propertyWithGetter.kt
@@ -62,7 +62,7 @@ FILE: propertyWithGetter.kt
    }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: propertyWithGetter.kt
@@ -71,7 +71,7 @@ FILE: propertyWithGetter.kt
    }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 EXPECT_ACTUAL_MATCHING:
 FILE: propertyWithGetter.kt
@@ -80,7 +80,7 @@ FILE: propertyWithGetter.kt
    }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val withGetter: Int
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
 BODY_RESOLVE:
 FILE: propertyWithGetter.kt
@@ -90,7 +90,7 @@ FILE: propertyWithGetter.kt
    public final [CONTRACTS] fun receive([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| {
    }
    public final [CONTRACTS] val withGetter: R|kotlin/Int|
-        [CONTRACTS] public get(): R|kotlin/Int| {
+        public [CONTRACTS] get(): R|kotlin/Int| {
            ^ IntegerLiteral(42)
        }
@@ -102,6 +102,6 @@ FILE: propertyWithGetter.kt
    public final [BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
    }
    public final [BODY_RESOLVE] val withGetter: R|kotlin/Int|
-        [BODY_RESOLVE] public get(): R|kotlin/Int| {
+        public [BODY_RESOLVE] get(): R|kotlin/Int| {
            ^ Int(42)
        }
@@ -4,64 +4,64 @@ FILE: propertyWithGetterAndSetter.kt
    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 IMPORTS:
 FILE: propertyWithGetterAndSetter.kt
    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: propertyWithGetterAndSetter.kt
    public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 COMPANION_GENERATION:
 FILE: propertyWithGetterAndSetter.kt
    public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 SUPER_TYPES:
 FILE: propertyWithGetterAndSetter.kt
    public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 TYPES:
 FILE: propertyWithGetterAndSetter.kt
    public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 STATUS:
 FILE: propertyWithGetterAndSetter.kt
    public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: propertyWithGetterAndSetter.kt
    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 CONTRACTS:
 FILE: propertyWithGetterAndSetter.kt
@@ -71,8 +71,8 @@ FILE: propertyWithGetterAndSetter.kt
    }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: propertyWithGetterAndSetter.kt
@@ -82,8 +82,8 @@ FILE: propertyWithGetterAndSetter.kt
    }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 EXPECT_ACTUAL_MATCHING:
 FILE: propertyWithGetterAndSetter.kt
@@ -93,8 +93,8 @@ FILE: propertyWithGetterAndSetter.kt
    }
    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] var withGetterAndSetter: Int = LAZY_EXPRESSION
-        [RAW_FIR] public? get(): Int { LAZY_BLOCK }
+        public? [RAW_FIR] get(): Int { LAZY_BLOCK }
-        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] value: Int): R|kotlin/Unit| { LAZY_BLOCK }
 BODY_RESOLVE:
 FILE: propertyWithGetterAndSetter.kt
@@ -105,10 +105,10 @@ FILE: propertyWithGetterAndSetter.kt
    public final [CONTRACTS] fun receive([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| {
    }
    public final [CONTRACTS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42)
-        [CONTRACTS] public get(): R|kotlin/Int| {
+        public [CONTRACTS] get(): R|kotlin/Int| {
            ^ field#
        }
-        [CONTRACTS] public set([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public [CONTRACTS] set([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| {
            field# = value#
        }
@@ -121,9 +121,9 @@ FILE: propertyWithGetterAndSetter.kt
    public final [BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
    }
    public final [BODY_RESOLVE] [IsReferredViaField=true] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-        [BODY_RESOLVE] public get(): R|kotlin/Int| {
+        public [BODY_RESOLVE] get(): R|kotlin/Int| {
            ^ F|/withGetterAndSetter|
        }
-        [BODY_RESOLVE] public set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
+        public [BODY_RESOLVE] set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
            F|/withGetterAndSetter| = R|<local>/value|
        }
@@ -3,49 +3,49 @@ RAW_FIR:
 FILE: propertyWithInitializer.kt
    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 IMPORTS:
 FILE: propertyWithInitializer.kt
    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: propertyWithInitializer.kt
    public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 COMPANION_GENERATION:
 FILE: propertyWithInitializer.kt
    public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 SUPER_TYPES:
 FILE: propertyWithInitializer.kt
    public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 TYPES:
 FILE: propertyWithInitializer.kt
    public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 STATUS:
 FILE: propertyWithInitializer.kt
    public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: propertyWithInitializer.kt
    public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 CONTRACTS:
 FILE: propertyWithInitializer.kt
@@ -53,7 +53,7 @@ FILE: propertyWithInitializer.kt
        receive#(property#)
    }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: propertyWithInitializer.kt
@@ -61,7 +61,7 @@ FILE: propertyWithInitializer.kt
        receive#(property#)
    }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 EXPECT_ACTUAL_MATCHING:
 FILE: propertyWithInitializer.kt
@@ -69,7 +69,7 @@ FILE: propertyWithInitializer.kt
        receive#(property#)
    }
    public? final? [RAW_FIR] val property: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
 BODY_RESOLVE:
 FILE: propertyWithInitializer.kt
@@ -77,7 +77,7 @@ FILE: propertyWithInitializer.kt
        <Unresolved name: receive>#(R|/property|)
    }
    public final [CONTRACTS] val property: R|kotlin/Int| = IntegerLiteral(10)
-        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        public [BODY_RESOLVE] get(): R|kotlin/Int|
 FILE RAW TO BODY:
 FILE: propertyWithInitializer.kt
@@ -85,4 +85,4 @@ FILE: propertyWithInitializer.kt
        <Unresolved name: receive>#(R|/property|)
    }
    public final [BODY_RESOLVE] val property: R|kotlin/Int| = Int(10)
-        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        public [BODY_RESOLVE] get(): R|kotlin/Int|
@@ -2,87 +2,87 @@
 RAW_FIR:
 FILE: typeParameterOfTopSetter.kt
    public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
-        [RAW_FIR] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
 IMPORTS:
 FILE: typeParameterOfTopSetter.kt
    public? final? [RAW_FIR] var x: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
-        [RAW_FIR] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [RAW_FIR] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: typeParameterOfTopSetter.kt
    public? final? [COMPILER_REQUIRED_ANNOTATIONS] var x: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
-        [COMPILER_REQUIRED_ANNOTATIONS] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [COMPILER_REQUIRED_ANNOTATIONS] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
 COMPANION_GENERATION:
 FILE: typeParameterOfTopSetter.kt
    public? final? [COMPANION_GENERATION] var x: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
-        [COMPANION_GENERATION] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [COMPANION_GENERATION] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
 SUPER_TYPES:
 FILE: typeParameterOfTopSetter.kt
    public? final? [SUPER_TYPES] var x: Int = LAZY_EXPRESSION
-        [TYPES] public? get(): Int
+        public? [TYPES] get(): Int
-        [SUPER_TYPES] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [SUPER_TYPES] set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK }
 TYPES:
 FILE: typeParameterOfTopSetter.kt
    public? final? [TYPES] var x: R|kotlin/Int| = LAZY_EXPRESSION
-        [TYPES] public? get(): R|kotlin/Int|
+        public? [TYPES] get(): R|kotlin/Int|
-        [TYPES] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
+        public? [TYPES] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
 STATUS:
 FILE: typeParameterOfTopSetter.kt
    public final [STATUS] var x: R|kotlin/Int| = LAZY_EXPRESSION
-        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        public [BODY_RESOLVE] get(): R|kotlin/Int|
-        [STATUS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
+        public [STATUS] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: typeParameterOfTopSetter.kt
    public final [ARGUMENTS_OF_ANNOTATIONS] var x: R|kotlin/Int| = LAZY_EXPRESSION
-        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        public [BODY_RESOLVE] get(): R|kotlin/Int|
-        [ARGUMENTS_OF_ANNOTATIONS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
+        public [ARGUMENTS_OF_ANNOTATIONS] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
 CONTRACTS:
 FILE: typeParameterOfTopSetter.kt
    public final [CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
-        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        public [BODY_RESOLVE] get(): R|kotlin/Int|
-        [CONTRACTS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public [CONTRACTS] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
            ^ Unit#
        }
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: typeParameterOfTopSetter.kt
    public final [IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2)
-        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        public [BODY_RESOLVE] get(): R|kotlin/Int|
-        [IMPLICIT_TYPES_BODY_RESOLVE] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public [IMPLICIT_TYPES_BODY_RESOLVE] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
            ^ Unit#
        }
 EXPECT_ACTUAL_MATCHING:
 FILE: typeParameterOfTopSetter.kt
    public final [EXPECT_ACTUAL_MATCHING] var x: R|kotlin/Int| = IntegerLiteral(2)
-        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        public [BODY_RESOLVE] get(): R|kotlin/Int|
-        [EXPECT_ACTUAL_MATCHING] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public [EXPECT_ACTUAL_MATCHING] set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
            ^ Unit#
        }
 BODY_RESOLVE:
 FILE: typeParameterOfTopSetter.kt
    public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        public [BODY_RESOLVE] get(): R|kotlin/Int|
-        [BODY_RESOLVE] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public [BODY_RESOLVE] set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
            ^ Q|kotlin/Unit|
        }
 FILE RAW TO BODY:
 FILE: typeParameterOfTopSetter.kt
    public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        public [BODY_RESOLVE] get(): R|kotlin/Int|
-        [BODY_RESOLVE] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public [BODY_RESOLVE] set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
            ^ Q|kotlin/Unit|
        }
@@ -1,2 +1,2 @@
 public final [BODY_RESOLVE] val b: R|A.B|
-    [BODY_RESOLVE] public get(): R|A.B|
+    public [BODY_RESOLVE] get(): R|A.B|
@@ -1,2 +1,2 @@
 public final [BODY_RESOLVE] val niewbe: R|kotlin/String| = String(Hello)
-    [BODY_RESOLVE] public get(): R|kotlin/String|
+    public [BODY_RESOLVE] get(): R|kotlin/String|
@@ -17,7 +17,7 @@ FILE: annotation.kt
        }
        @base() public? final? [IsFromPrimaryConstructor=true] val x: Int = R|<local>/x|
-            [ContainingClassKey=correct] public? get(): Int
+            public? [ContainingClassKey=correct] get(): Int
        @base() public? [ContainingClassKey=correct] constructor(): R|correct| {
            this<R|correct|>(IntegerLiteral(0))
@@ -16,16 +16,16 @@ FILE: annotationsOnNullableParenthesizedTypes.kt
        public? final? fun returnArgument(): B<@A() C?>
        public? final? val lambdaType: @A() ( () -> C )?
-            [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] public? get(): @A() ( () -> C )?
+            public? [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] get(): @A() ( () -> C )?
        public? final? val lambdaParameter: ( (@A() C?) -> C )
-            [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] public? get(): ( (@A() C?) -> C )
+            public? [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] get(): ( (@A() C?) -> C )
        public? final? val lambdaReturnValue: ( () -> @A() C? )
-            [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] public? get(): ( () -> @A() C? )
+            public? [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] get(): ( () -> @A() C? )
        public? final? val lambdaReceiver: ( @A() C?.() -> C )
-            [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] public? get(): ( @A() C?.() -> C )
+            public? [ContainingClassKey=AnnotationsOnNullableParenthesizedTypes] get(): ( @A() C?.() -> C )
    }
    @Target(AnnotationTarget#.TYPE#, AnnotationTarget#.TYPE_PARAMETER#) public? final? annotation class A : R|kotlin/Annotation| {
@@ -16,19 +16,19 @@ FILE: annotationsOnParenthesizedTypes.kt
        public? final? fun returnArgument(): B<@A() C>
        public? final? val lambdaType: @A() ( () -> C )
-            [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): @A() ( () -> C )
+            public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): @A() ( () -> C )
        public? final? val lambdaParameter: ( (@A() C) -> C )
-            [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): ( (@A() C) -> C )
+            public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): ( (@A() C) -> C )
        public? final? val lambdaReturnValue: ( () -> @A() C )
-            [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): ( () -> @A() C )
+            public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): ( () -> @A() C )
        public? final? val lambdaReceiver: ( @A() C.() -> C )
-            [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): ( @A() C.() -> C )
+            public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): ( @A() C.() -> C )
        public? final? val lambdaParameterNP: ( (@A() C) -> C )
-            [ContainingClassKey=AnnotationsOnParenthesizedTypes] public? get(): ( (@A() C) -> C )
+            public? [ContainingClassKey=AnnotationsOnParenthesizedTypes] get(): ( (@A() C) -> C )
    }
    @Target(AnnotationTarget#.TYPE#, AnnotationTarget#.TYPE_PARAMETER#) public? final? annotation class A : R|kotlin/Annotation| {
@@ -14,6 +14,6 @@ FILE: complexTypes.kt
    }
    public? final? interface Test : R|kotlin/Any| {
        public? final? val x: a.b.C<out CharSequence, *>.D<in List<*>, *>
-            [ContainingClassKey=Test] public? get(): a.b.C<out CharSequence, *>.D<in List<*>, *>
+            public? [ContainingClassKey=Test] get(): a.b.C<out CharSequence, *>.D<in List<*>, *>
    }
@@ -5,14 +5,14 @@ FILE: propertyAccessorsContractDescription.kt
        }
        public? final? var myInt: Int = IntegerLiteral(0)
-            [ContainingClassKey=MyClass] public? get(): Int
+            public? [ContainingClassKey=MyClass] get(): Int
                [Contract description] <
                    returnsNotNull#()
                >
             {
                ^ IntegerLiteral(1)
            }
-            [ContainingClassKey=MyClass] public? set(value: Int): R|kotlin/Unit| {
+            public? [ContainingClassKey=MyClass] set(value: Int): R|kotlin/Unit| {
                field# = value#.times#(IntegerLiteral(10))
            }
@@ -23,14 +23,14 @@ FILE: propertyAccessorsContractDescription.kt
        }
        public? final? var anotherInt: Int = IntegerLiteral(0)
-            [ContainingClassKey=AnotherClass] public? get(): Int
+            public? [ContainingClassKey=AnotherClass] get(): Int
                [Contract description] <
                    returnsNotNull#()
                >
             {
                ^ IntegerLiteral(1)
            }
-            [ContainingClassKey=AnotherClass] public? set(value: Int): R|kotlin/Unit|
+            public? [ContainingClassKey=AnotherClass] set(value: Int): R|kotlin/Unit|
                [Contract description] <
                    returns#()
                >
@@ -45,14 +45,14 @@ FILE: propertyAccessorsContractDescription.kt
        }
        public? final? var someInt: Int = IntegerLiteral(0)
-            [ContainingClassKey=SomeClass] public? get(): Int
+            public? [ContainingClassKey=SomeClass] get(): Int
                [Contract description] <
                    returnsNotNull#()
                >
             {
                ^ IntegerLiteral(1)
            }
-            [ContainingClassKey=SomeClass] public? set(value: Int): R|kotlin/Unit|
+            public? [ContainingClassKey=SomeClass] set(value: Int): R|kotlin/Unit|
                [Contract description] <
                    returns#().implies#(!=(value#, Null(null)))
                >
@@ -5,7 +5,7 @@ FILE: derivedClass.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val x: T = R|<local>/x|
-            [ContainingClassKey=Base] public? get(): T
+            public? [ContainingClassKey=Base] get(): T
    }
    public? final? class Derived<T : Any> : Base<T> {
@@ -20,10 +20,10 @@ FILE: enums.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val m: Double = R|<local>/m|
-            [ContainingClassKey=Planet] public? get(): Double
+            public? [ContainingClassKey=Planet] get(): Double
        internal final? [IsFromPrimaryConstructor=true] val r: Double = R|<local>/r|
-            [ContainingClassKey=Planet] internal get(): Double
+            internal [ContainingClassKey=Planet] get(): Double
        public final static [ContainingClassKey=Planet] enum entry MERCURY: R|Planet| = object : R|Planet| {
            private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
@@ -59,7 +59,7 @@ FILE: enums.kt
        }
        public? final? val g: Double = G#.times#(m#).div#(r#.times#(r#))
-            [ContainingClassKey=Planet] public? get(): Double
+            public? [ContainingClassKey=Planet] get(): Double
        public? abstract fun sayHello(): R|kotlin/Unit|
@@ -69,7 +69,7 @@ FILE: enums.kt
            }
            public? final? const val G: <implicit> = Double(6.67E-11)
-                [ContainingClassKey=Companion] public? get(): <implicit>
+                public? [ContainingClassKey=Companion] get(): <implicit>
        }
@@ -86,7 +86,7 @@ FILE: enums.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val signature: String = R|<local>/signature|
-            [ContainingClassKey=PseudoInsn] public? get(): String
+            public? [ContainingClassKey=PseudoInsn] get(): String
        public final static [ContainingClassKey=PseudoInsn] enum entry FIX_STACK_BEFORE_JUMP: R|PseudoInsn| = object : R|PseudoInsn| {
            private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
@@ -19,7 +19,7 @@ FILE: enums2.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val x: Some = R|<local>/x|
-            [ContainingClassKey=SomeEnum] public? get(): Some
+            public? [ContainingClassKey=SomeEnum] get(): Some
        public final static [ContainingClassKey=SomeEnum] enum entry FIRST: R|SomeEnum| = object : R|SomeEnum| {
            private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
@@ -16,8 +16,8 @@ FILE: external.kt
        public? final? external fun bar(): String
        public? final? var y: Int
-            [ContainingClassKey=NotExternal] public? external get(): Int
+            public? external [ContainingClassKey=NotExternal] get(): Int
-            [ContainingClassKey=NotExternal] public? set(value: Int): R|kotlin/Unit| {
+            public? [ContainingClassKey=NotExternal] set(value: Int): R|kotlin/Unit| {
            }
    }
@@ -5,7 +5,7 @@ FILE: nestedClass.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val s: String = R|<local>/s|
-            [ContainingClassKey=Base] public? get(): String
+            public? [ContainingClassKey=Base] get(): String
    }
    public? final? class Outer : R|kotlin/Any| {
@@ -1,7 +1,7 @@
 FILE: noPrimaryConstructor.kt
    public? final? class NoPrimary : R|kotlin/Any| {
        public? final? val x: String
-            [ContainingClassKey=NoPrimary] public? get(): String
+            public? [ContainingClassKey=NoPrimary] get(): String
        public? [ContainingClassKey=NoPrimary] constructor(x: String): R|NoPrimary| {
            super<R|kotlin/Any|>()
@@ -3,7 +3,7 @@ FILE: simpleClass.kt
        public? final? fun foo(x: Int, y: String): String
        public? final? val bar: Boolean
-            [ContainingClassKey=SomeInterface] public? get(): Boolean
+            public? [ContainingClassKey=SomeInterface] get(): Boolean
    }
    public? final? class SomeClass : SomeInterface {
@@ -12,22 +12,22 @@ FILE: simpleClass.kt
        }
        private final? val baz: <implicit> = IntegerLiteral(42)
-            [ContainingClassKey=SomeClass] private get(): <implicit>
+            private [ContainingClassKey=SomeClass] get(): <implicit>
        public? open? override fun foo(x: Int, y: String): String {
            ^foo y#.plus#(x#).plus#(baz#)
        }
        public? open? override var bar: Boolean
-            [ContainingClassKey=SomeClass] public? get(): Boolean {
+            public? [ContainingClassKey=SomeClass] get(): Boolean {
                ^ Boolean(true)
            }
-            [ContainingClassKey=SomeClass] public? set(value: Boolean): R|kotlin/Unit| {
+            public? [ContainingClassKey=SomeClass] set(value: Boolean): R|kotlin/Unit| {
            }
        public? final? lateinit var fau: Double
-            [ContainingClassKey=SomeClass] public? get(): Double
+            public? [ContainingClassKey=SomeClass] get(): Double
-            [ContainingClassKey=SomeClass] public? set(value: Double): R|kotlin/Unit|
+            public? [ContainingClassKey=SomeClass] set(value: Double): R|kotlin/Unit|
    }
    public? final? inline class InlineClass : R|kotlin/Any| {
@@ -14,15 +14,15 @@ FILE: typeParameterVsNested.kt
        }
        public? abstract val x: T
-            [ContainingClassKey=My] public? get(): T
+            public? [ContainingClassKey=My] get(): T
        public? abstract fun foo(arg: T): R|kotlin/Unit|
        public? abstract val y: My.T
-            [ContainingClassKey=My] public? get(): My.T
+            public? [ContainingClassKey=My] get(): My.T
        public? abstract val z: test.My.T
-            [ContainingClassKey=My] public? get(): test.My.T
+            public? [ContainingClassKey=My] get(): test.My.T
        public? final? class Some : T {
            public? [ContainingClassKey=Some] constructor(): R|test/My.Some| {
@@ -26,10 +26,10 @@ FILE: annotated.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val x: Int = R|<local>/x|
-            [ContainingClassKey=Two] public? get(): Int
+            public? [ContainingClassKey=Two] get(): Int
        public? final? [IsFromPrimaryConstructor=true] val y: Int = R|<local>/y|
-            [ContainingClassKey=Two] public? get(): Int
+            public? [ContainingClassKey=Two] get(): Int
        public final operator fun component1(): Int
@@ -10,7 +10,7 @@ FILE: arrayAccess.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val v: IntArray = R|<local>/v|
-            [ContainingClassKey=Wrapper] public? get(): IntArray
+            public? [ContainingClassKey=Wrapper] get(): IntArray
    }
    public? final? fun test(a: IntArray, w: Wrapper): <implicit> {
@@ -8,7 +8,7 @@ FILE: callableReferences.kt
        }
        public? final? val bar: <implicit> = IntegerLiteral(0)
-            [ContainingClassKey=A] public? get(): <implicit>
+            public? [ContainingClassKey=A] get(): <implicit>
    }
    public? final? fun A.qux(): R|kotlin/Unit| {
@@ -14,8 +14,8 @@ FILE: calls.kt
        }
        public? final? [IsFromPrimaryConstructor=true] var x: Int = R|<local>/x|
-            [ContainingClassKey=My] public? get(): Int
+            public? [ContainingClassKey=My] get(): Int
-            [ContainingClassKey=My] public? set(value: Int): R|kotlin/Unit|
+            public? [ContainingClassKey=My] set(value: Int): R|kotlin/Unit|
        public? final? operator fun invoke(): <implicit> {
            ^invoke x#
@@ -5,7 +5,7 @@ FILE: collectionLiterals.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val arr: IntArray = R|<local>/arr|
-            [ContainingClassKey=Ann1] public? get(): IntArray
+            public? [ContainingClassKey=Ann1] get(): IntArray
    }
    public? final? annotation class Ann2 : R|kotlin/Annotation| {
@@ -14,7 +14,7 @@ FILE: collectionLiterals.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val arr: DoubleArray = R|<local>/arr|
-            [ContainingClassKey=Ann2] public? get(): DoubleArray
+            public? [ContainingClassKey=Ann2] get(): DoubleArray
    }
    public? final? annotation class Ann3 : R|kotlin/Annotation| {
@@ -23,7 +23,7 @@ FILE: collectionLiterals.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val arr: Array<String> = R|<local>/arr|
-            [ContainingClassKey=Ann3] public? get(): Array<String>
+            public? [ContainingClassKey=Ann3] get(): Array<String>
    }
    @Ann1(<implicitArrayOf>()) @Ann2(<implicitArrayOf>()) @Ann3(<implicitArrayOf>()) public? final? class Zero : R|kotlin/Any| {
@@ -5,13 +5,13 @@ FILE: destructuring.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val first: Int = R|<local>/first|
-            [ContainingClassKey=Some] public? get(): Int
+            public? [ContainingClassKey=Some] get(): Int
        public? final? [IsFromPrimaryConstructor=true] val second: Double = R|<local>/second|
-            [ContainingClassKey=Some] public? get(): Double
+            public? [ContainingClassKey=Some] get(): Double
        public? final? [IsFromPrimaryConstructor=true] val third: String = R|<local>/third|
-            [ContainingClassKey=Some] public? get(): String
+            public? [ContainingClassKey=Some] get(): String
        public final operator fun component1(): Int
@@ -55,10 +55,10 @@ FILE: for.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val x: Int = R|<local>/x|
-            [ContainingClassKey=Some] public? get(): Int
+            public? [ContainingClassKey=Some] get(): Int
        public? final? [IsFromPrimaryConstructor=true] val y: Int = R|<local>/y|
-            [ContainingClassKey=Some] public? get(): Int
+            public? [ContainingClassKey=Some] get(): Int
        public final operator fun component1(): Int
@@ -5,7 +5,7 @@ FILE: init.kt
        }
        public? final? val x: Int
-            [ContainingClassKey=WithInit] public? get(): Int
+            public? [ContainingClassKey=WithInit] get(): Int
        init {
            this#.x# = x#
@@ -5,10 +5,10 @@ FILE: lambda.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val x: Int = R|<local>/x|
-            [ContainingClassKey=Tuple] public? get(): Int
+            public? [ContainingClassKey=Tuple] get(): Int
        public? final? [IsFromPrimaryConstructor=true] val y: Int = R|<local>/y|
-            [ContainingClassKey=Tuple] public? get(): Int
+            public? [ContainingClassKey=Tuple] get(): Int
        public final operator fun component1(): Int
@@ -6,7 +6,7 @@ FILE: locals.kt
            }
            public? final? [IsFromPrimaryConstructor=true] val pp: Int = R|<local>/pp|
-                [ContainingClassKey=Local] public? get(): Int
+                public? [ContainingClassKey=Local] get(): Int
            public? final? fun diff(): <implicit> {
                ^diff pp#.minus#(p#)
@@ -13,7 +13,7 @@ FILE: these.kt
        }
        public? final? val instance: Some
-            [ContainingClassKey=Some] public? get(): Some {
+            public? [ContainingClassKey=Some] get(): Some {
                ^ this@Some#
            }
@@ -36,7 +36,7 @@ FILE: unary.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val i: Int = R|<local>/i|
-            [ContainingClassKey=X] public? get(): Int
+            public? [ContainingClassKey=X] get(): Int
    }
    public? final? fun test2(x: X): R|kotlin/Unit| {
@@ -79,7 +79,7 @@ FILE: unary.kt
        }
        public? final? [IsFromPrimaryConstructor=true] val arr: Array<Int> = R|<local>/arr|
-            [ContainingClassKey=Y] public? get(): Array<Int>
+            public? [ContainingClassKey=Y] get(): Array<Int>
    }
    public? final? fun test4(y: Y): R|kotlin/Unit| {
@@ -5,15 +5,45 @@
 package org.jetbrains.kotlin.fir.renderer
-import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
 open class FirDeclarationRenderer {
    internal lateinit var components: FirRendererComponents
    protected val printer get() = components.printer
    private val resolvePhaseRenderer get() = components.resolvePhaseRenderer
    private val typeRenderer get() = components.typeRenderer
    fun render(declaration: FirDeclaration) {
        renderPhaseAndAttributes(declaration)
        if (declaration is FirConstructor) {
            declaration.dispatchReceiverType?.let {
                typeRenderer.render(it)
                printer.print(".")
            }
            printer.print("constructor")
            return
        }
        printer.print(
            when (declaration) {
                is FirRegularClass -> declaration.classKind.name.toLowerCaseAsciiOnly().replace("_", " ")
                is FirTypeAlias -> "typealias"
                is FirAnonymousFunction -> (declaration.label?.let { "${it.name}@" } ?: "") + "fun"
                is FirSimpleFunction -> "fun"
                is FirProperty -> {
                    val prefix = if (declaration.isLocal) "l" else ""
                    prefix + if (declaration.isVal) "val" else "var"
                }
                is FirPropertyAccessor -> if (declaration.isGetter) "get" else "set"
                is FirField -> "field"
                is FirEnumEntry -> "enum entry"
                else -> "unknown"
            }
        )
    }
    internal fun renderPhaseAndAttributes(declaration: FirDeclaration) {
        resolvePhaseRenderer?.render(declaration)
        with(declaration) {
            renderDeclarationAttributes()
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
 import org.jetbrains.kotlin.name.StandardClassIds
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import java.util.*
@@ -243,7 +242,7 @@ class FirRenderer(
        override fun visitMemberDeclaration(memberDeclaration: FirMemberDeclaration) {
            modifierRenderer.renderModifiers(memberDeclaration)
-            visitDeclaration(memberDeclaration as FirDeclaration)
+            declarationRenderer.render(memberDeclaration)
            when (memberDeclaration) {
                is FirClassLikeDeclaration -> {
                    if (memberDeclaration is FirRegularClass) {
@@ -264,24 +263,6 @@ class FirRenderer(
            }
        }
        override fun visitDeclaration(declaration: FirDeclaration) {
            declarationRenderer.render(declaration)
            print(
                when (declaration) {
                    is FirRegularClass -> declaration.classKind.name.toLowerCaseAsciiOnly().replace("_", " ")
                    is FirTypeAlias -> "typealias"
                    is FirSimpleFunction -> "fun"
                    is FirProperty -> {
                        val prefix = if (declaration.isLocal) "l" else ""
                        prefix + if (declaration.isVal) "val" else "var"
                    }
                    is FirField -> "field"
                    is FirEnumEntry -> "enum entry"
                    else -> "unknown"
                }
            )
        }
        override fun visitRegularClass(regularClass: FirRegularClass) {
            renderContexts(regularClass.contextReceivers)
            annotationRenderer?.render(regularClass)
@@ -356,11 +337,6 @@ class FirRenderer(
            modifierRenderer.renderModifiers(constructor)
            declarationRenderer.render(constructor)
            constructor.dispatchReceiverType?.let {
                typeRenderer.render(it)
                print(".")
            }
            print("constructor")
            constructor.typeParameters.renderTypeParameters()
            valueParameterRenderer.renderParameters(constructor.valueParameters)
            print(": ")
@@ -374,10 +350,9 @@ class FirRenderer(
        }
        override fun visitPropertyAccessor(propertyAccessor: FirPropertyAccessor) {
            declarationRenderer.render(propertyAccessor)
            annotationRenderer?.render(propertyAccessor)
            modifierRenderer.renderModifiers(propertyAccessor)
-            print(if (propertyAccessor.isGetter) "get" else "set")
+            declarationRenderer.render(propertyAccessor)
            valueParameterRenderer.renderParameters(propertyAccessor.valueParameters)
            print(": ")
            propertyAccessor.returnTypeRef.accept(this)
@@ -390,13 +365,9 @@ class FirRenderer(
        }
        override fun visitAnonymousFunction(anonymousFunction: FirAnonymousFunction) {
            declarationRenderer.render(anonymousFunction)
            annotationRenderer?.render(anonymousFunction)
-            val label = anonymousFunction.label
+            declarationRenderer.render(anonymousFunction)
-            if (label != null) {
+            print(" ")
                print("${label.name}@")
            }
            print("fun ")
            val receiverType = anonymousFunction.receiverTypeRef
            if (receiverType != null) {
                receiverType.accept(this)
@@ -422,7 +393,7 @@ class FirRenderer(
        override fun visitFunction(function: FirFunction) {
            valueParameterRenderer.renderParameters(function.valueParameters)
-            visitDeclaration(function)
+            declarationRenderer.render(function)
            bodyRenderer?.render(function)
        }
@@ -28,7 +28,7 @@ open class FirValueParameterRenderer {
    }
    fun renderParameter(valueParameter: FirValueParameter) {
-        declarationRenderer.render(valueParameter)
+        declarationRenderer.renderPhaseAndAttributes(valueParameter)
        annotationRenderer?.render(valueParameter)
        modifierRenderer.renderModifiers(valueParameter)
        if (valueParameter.name != SpecialNames.NO_NAME_PROVIDED) {
`@@ -1,2 +1,2 @@`
	`public final [BODY_RESOLVE] val b: R\|A.B\|`	`public final [BODY_RESOLVE] val b: R\|A.B\|`
	`[BODY_RESOLVE] public get(): R\|A.B\|`	`public [BODY_RESOLVE] get(): R\|A.B\|`
`@@ -1,2 +1,2 @@`
	`public final [BODY_RESOLVE] val niewbe: R\|kotlin/String\| = String(Hello)`	`public final [BODY_RESOLVE] val niewbe: R\|kotlin/String\| = String(Hello)`
	`[BODY_RESOLVE] public get(): R\|kotlin/String\|`	`public [BODY_RESOLVE] get(): R\|kotlin/String\|`