diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/annotations.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/annotations.txt
index 9fe3622e4d9..89d86e6a26f 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/annotations.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/annotations.txt
@@ -1,113 +1,113 @@
 RAW_FIR:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @Suppress(String(2)) public? final? fun resolveMe(): R|kotlin/Unit| {
+    @Suppress(String(2)) public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
     }
 
 IMPORTS:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @Suppress(String(2)) public? final? fun resolveMe(): R|kotlin/Unit| {
+    @Suppress(String(2)) public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
     }
 
 SUPER_TYPES:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @Suppress(String(2)) public? final? fun resolveMe(): R|kotlin/Unit| {
+    @Suppress(String(2)) public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
     }
 
 TYPES:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
     }
 
 STATUS:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
     }
 
 CONTRACTS:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
     }
 
 BODY_RESOLVE:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(vararg(String(2))) public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(vararg(String(2))) public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
     }
 
 NoResolve:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @Suppress(String(2)) public? final? fun resolveMe(): R|kotlin/Unit| {
+    @Suppress(String(2)) public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
     }
 
 BodyResolveWithChildren:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(vararg(String(2))) public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(vararg(String(2))) public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
     }
 
 CallableBodyResolve:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(vararg(String(2))) public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(vararg(String(2))) public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
     }
 
 CallableReturnType:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @Suppress(String(2)) public? final? fun resolveMe(): R|kotlin/Unit| {
+    @Suppress(String(2)) public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
     }
 
 AnnotationType:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
     }
 
 AnnotationsArguments:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(vararg(String(2))) public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(vararg(String(2))) public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
     }
 
 CallableContracts:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
     }
 
 DeclarationStatus:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
     }
 
 ValueParametersTypes:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
     }
 
 TypeParametersTypes:
 FILE: annotations.kt
     @FILE:Suppress(String(1))
-    @R|kotlin/Suppress|(String(2)) public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(String(2)) public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
     }
 
 FILE RAW TO BODY:
 FILE: annotations.kt
     @FILE:R|kotlin/Suppress|(vararg(String(1)))
-    @R|kotlin/Suppress|(vararg(String(2))) public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|(vararg(String(2))) public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/classMembers.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/classMembers.txt
index b69f1b71f1f..4a63ec83ed8 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/classMembers.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/classMembers.txt
@@ -1,23 +1,23 @@
 RAW_FIR:
 FILE: classMembers.kt
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun resolveMe(): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -25,24 +25,24 @@ FILE: classMembers.kt
 
 IMPORTS:
 FILE: classMembers.kt
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun resolveMe(): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -50,24 +50,24 @@ FILE: classMembers.kt
 
 SUPER_TYPES:
 FILE: classMembers.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [SUPER_TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun resolveMe(): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -75,24 +75,24 @@ FILE: classMembers.kt
 
 TYPES:
 FILE: classMembers.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -100,24 +100,24 @@ FILE: classMembers.kt
 
 STATUS:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -125,24 +125,24 @@ FILE: classMembers.kt
 
 CONTRACTS:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+        public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -150,24 +150,24 @@ FILE: classMembers.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+        public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -175,24 +175,24 @@ FILE: classMembers.kt
 
 BODY_RESOLVE:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
             this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
             ^functionWithLazyBody String(42)
         }
 
@@ -200,24 +200,24 @@ FILE: classMembers.kt
 
 NoResolve:
 FILE: classMembers.kt
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun resolveMe(): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -225,24 +225,24 @@ FILE: classMembers.kt
 
 BodyResolveWithChildren:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
             this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
             ^functionWithLazyBody String(42)
         }
 
@@ -250,24 +250,24 @@ FILE: classMembers.kt
 
 CallableBodyResolve:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
             this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
             ^functionWithLazyBody String(42)
         }
 
@@ -275,24 +275,24 @@ FILE: classMembers.kt
 
 CallableReturnType:
 FILE: classMembers.kt
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun resolveMe(): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -300,24 +300,24 @@ FILE: classMembers.kt
 
 AnnotationType:
 FILE: classMembers.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -325,24 +325,24 @@ FILE: classMembers.kt
 
 AnnotationsArguments:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
             this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
             ^functionWithLazyBody String(42)
         }
 
@@ -350,24 +350,24 @@ FILE: classMembers.kt
 
 CallableContracts:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+        public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -375,24 +375,24 @@ FILE: classMembers.kt
 
 DeclarationStatus:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -400,24 +400,24 @@ FILE: classMembers.kt
 
 ValueParametersTypes:
 FILE: classMembers.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -425,24 +425,24 @@ FILE: classMembers.kt
 
 TypeParametersTypes:
 FILE: classMembers.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
             receive#(functionWithLazyBody#())
         }
 
-        public? final? val x: Int = IntegerLiteral(10)
-            [ContainingClassKey=A] public? get(): Int {
+        public? final? [RAW_FIR] val x: Int = IntegerLiteral(10)
+            [RAW_FIR] [ContainingClassKey=A] public? get(): Int {
                 ^ field#
             }
 
-        public? final? fun receive(value: String): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
         }
 
-        public? final? fun functionWithLazyBody(): String {
+        public? final? [RAW_FIR] fun functionWithLazyBody(): String {
             ^functionWithLazyBody String(42)
         }
 
@@ -450,24 +450,24 @@ FILE: classMembers.kt
 
 FILE RAW TO BODY:
 FILE: classMembers.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : R|kotlin/Any| {
+        public [BODY_RESOLVE] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final fun resolveMe(): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
             this@R|/A|.R|/A.receive|(this@R|/A|.R|/A.functionWithLazyBody|())
         }
 
-        public final [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
-            [ContainingClassKey=A] public get(): R|kotlin/Int| {
+        public final [BODY_RESOLVE] [IsReferredViaField=true] val x: R|kotlin/Int| = Int(10)
+            [BODY_RESOLVE] [ContainingClassKey=A] public get(): R|kotlin/Int| {
                 ^ this@R|/A|.F|/A.x|
             }
 
-        public final fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/String|): R|kotlin/Unit| {
         }
 
-        public final fun functionWithLazyBody(): R|kotlin/String| {
+        public final [BODY_RESOLVE] fun functionWithLazyBody(): R|kotlin/String| {
             ^functionWithLazyBody String(42)
         }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
index c385ceef268..b82ac311c28 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
@@ -1,911 +1,911 @@
 RAW_FIR:
 FILE: delegates.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 IMPORTS:
 FILE: delegates.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 SUPER_TYPES:
 FILE: delegates.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 TYPES:
 FILE: delegates.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 STATUS:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 CONTRACTS:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 BODY_RESOLVE:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/valueWithExplicitType|)
         R|/receive|(R|/valueWithImplicitType|)
         R|/variableWithExplicitType| = Int(10)
         R|/variableWithImplicitType| = Int(10)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
+        private [BODY_RESOLVE] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<R|kotlin/Any|>()
         }
 
-        public final override operator fun getValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
+        public final override operator [BODY_RESOLVE] fun getValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
             ^getValue Int(1)
         }
 
-        public final override operator fun setValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|, value: R|kotlin/Int|): R|kotlin/Unit| {
+        public final override operator [BODY_RESOLVE] fun setValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|, [BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
     }
 
-        public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithExplicitType: R|kotlin/Int|by delegate#
-        public get(): <implicit> {
+        [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithExplicitType: R|kotlin/Int|by delegate#
+        [STATUS] public get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithExplicitType: R|kotlin/Int|by delegate#
-        public get(): <implicit> {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithExplicitType: R|kotlin/Int|by delegate#
+        [STATUS] public get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [STATUS] public set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
         }
-        public set(<set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        [BODY_RESOLVE] public 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|)
         }
 
 NoResolve:
 FILE: delegates.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 BodyResolveWithChildren:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/valueWithExplicitType|)
         R|/receive|(R|/valueWithImplicitType|)
         R|/variableWithExplicitType| = Int(10)
         R|/variableWithImplicitType| = Int(10)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
+        private [BODY_RESOLVE] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<R|kotlin/Any|>()
         }
 
-        public final override operator fun getValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
+        public final override operator [BODY_RESOLVE] fun getValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
             ^getValue Int(1)
         }
 
-        public final override operator fun setValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|, value: R|kotlin/Int|): R|kotlin/Unit| {
+        public final override operator [BODY_RESOLVE] fun setValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|, [BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
     }
 
-        public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithExplicitType: R|kotlin/Int|by delegate#
-        public get(): <implicit> {
+        [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithExplicitType: R|kotlin/Int|by delegate#
+        [STATUS] public get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithExplicitType: R|kotlin/Int|by delegate#
-        public get(): <implicit> {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithExplicitType: R|kotlin/Int|by delegate#
+        [STATUS] public get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [STATUS] public set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
         }
-        public set(<set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        [BODY_RESOLVE] public 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|)
         }
 
 CallableBodyResolve:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/valueWithExplicitType|)
         R|/receive|(R|/valueWithImplicitType|)
         R|/variableWithExplicitType| = Int(10)
         R|/variableWithImplicitType| = Int(10)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
+        private [BODY_RESOLVE] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<R|kotlin/Any|>()
         }
 
-        public final override operator fun getValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
+        public final override operator [BODY_RESOLVE] fun getValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
             ^getValue Int(1)
         }
 
-        public final override operator fun setValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|, value: R|kotlin/Int|): R|kotlin/Unit| {
+        public final override operator [BODY_RESOLVE] fun setValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|, [BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
     }
 
-        public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithExplicitType: R|kotlin/Int|by delegate#
-        public get(): <implicit> {
+        [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithExplicitType: R|kotlin/Int|by delegate#
+        [STATUS] public get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithExplicitType: R|kotlin/Int|by delegate#
-        public get(): <implicit> {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithExplicitType: R|kotlin/Int|by delegate#
+        [STATUS] public get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [STATUS] public set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
         }
-        public set(<set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        [BODY_RESOLVE] public 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|)
         }
 
 CallableReturnType:
 FILE: delegates.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 AnnotationType:
 FILE: delegates.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 AnnotationsArguments:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/valueWithExplicitType|)
         R|/receive|(R|/valueWithImplicitType|)
         R|/variableWithExplicitType| = Int(10)
         R|/variableWithImplicitType| = Int(10)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
+        private [BODY_RESOLVE] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<R|kotlin/Any|>()
         }
 
-        public final override operator fun getValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
+        public final override operator [BODY_RESOLVE] fun getValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
             ^getValue Int(1)
         }
 
-        public final override operator fun setValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|, value: R|kotlin/Int|): R|kotlin/Unit| {
+        public final override operator [BODY_RESOLVE] fun setValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|, [BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
     }
 
-        public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithExplicitType: R|kotlin/Int|by delegate#
-        public get(): <implicit> {
+        [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithExplicitType: R|kotlin/Int|by delegate#
+        [STATUS] public get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithExplicitType: R|kotlin/Int|by delegate#
-        public get(): <implicit> {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithExplicitType: R|kotlin/Int|by delegate#
+        [STATUS] public get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [STATUS] public set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
         }
-        public set(<set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        [BODY_RESOLVE] public 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|)
         }
 
 CallableContracts:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 DeclarationStatus:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 ValueParametersTypes:
 FILE: delegates.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 TypeParametersTypes:
 FILE: delegates.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(valueWithExplicitType#)
         receive#(valueWithImplicitType#)
         variableWithExplicitType# = IntegerLiteral(10)
         variableWithImplicitType# = IntegerLiteral(10)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public? final? [RAW_FIR] val delegate: <implicit> = object : ReadWriteProperty<Any?, Int> {
+        private [RAW_FIR] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<<implicit>>()
         }
 
-        public? open? override fun getValue(thisRef: Any?, property: KProperty<*>): Int {
+        public? open? override [RAW_FIR] fun getValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>): Int {
             ^getValue IntegerLiteral(1)
         }
 
-        public? open? override fun setValue(thisRef: Any?, property: KProperty<*>, value: Int): R|kotlin/Unit| {
+        public? open? override [RAW_FIR] fun setValue([RAW_FIR] thisRef: Any?, [RAW_FIR] property: KProperty<*>, [RAW_FIR] value: Int): R|kotlin/Unit| {
         }
 
     }
 
-        public? get(): <implicit>
-    public? final? val valueWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+        [TYPES] public? get(): <implicit>
+    public? final? [RAW_FIR] val valueWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithExplicitType|.getValue#(Null(null), ::R|/valueWithExplicitType|)
         }
-    public? final? val valueWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] val valueWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/valueWithImplicitType|.getValue#(Null(null), ::R|/valueWithImplicitType|)
         }
-    public? final? var variableWithExplicitType: Intby delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithExplicitType: Intby delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithExplicitType|.getValue#(Null(null), ::R|/variableWithExplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithExplicitType|.setValue#(Null(null), ::R|/variableWithExplicitType|, R|<local>/variableWithExplicitType|)
         }
-    public? final? var variableWithImplicitType: <implicit>by delegate#
-        public? get(): <implicit> {
+    public? final? [RAW_FIR] var variableWithImplicitType: <implicit>by delegate#
+        [RAW_FIR] public? get(): <implicit> {
             ^ D|/variableWithImplicitType|.getValue#(Null(null), ::R|/variableWithImplicitType|)
         }
-        public? set(<set-?>: <implicit>): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] <set-?>: <implicit>): R|kotlin/Unit| {
             D|/variableWithImplicitType|.setValue#(Null(null), ::R|/variableWithImplicitType|, R|<local>/variableWithImplicitType|)
         }
 
 FILE RAW TO BODY:
 FILE: delegates.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/valueWithExplicitType|)
         R|/receive|(R|/valueWithImplicitType|)
         R|/variableWithExplicitType| = Int(10)
         R|/variableWithImplicitType| = Int(10)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
-        private [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
+        private [BODY_RESOLVE] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
             super<R|kotlin/Any|>()
         }
 
-        public final override operator fun getValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
+        public final override operator [BODY_RESOLVE] fun getValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|): R|kotlin/Int| {
             ^getValue Int(1)
         }
 
-        public final override operator fun setValue(thisRef: R|kotlin/Any?|, property: R|kotlin/reflect/KProperty<*>|, value: R|kotlin/Int|): R|kotlin/Unit| {
+        public final override operator [BODY_RESOLVE] fun setValue([BODY_RESOLVE] thisRef: R|kotlin/Any?|, [BODY_RESOLVE] property: R|kotlin/reflect/KProperty<*>|, [BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
         }
 
     }
 
-        public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val valueWithExplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+        [BODY_RESOLVE] public get(): R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>|
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val valueWithExplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/valueWithExplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithExplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val valueWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/valueWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/valueWithImplicitType|)
         }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var variableWithExplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var variableWithExplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/variableWithExplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithExplicitType|)
         }
-        public set(<set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        [BODY_RESOLVE] public 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 [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var variableWithImplicitType: R|kotlin/Int|by R|/delegate|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ D|/variableWithImplicitType|.R|SubstitutionOverride<kotlin/properties/ReadWriteProperty.getValue: R|kotlin/Int|>|(Null(null), ::R|/variableWithImplicitType|)
         }
-        public set(<set-?>: R|kotlin/Int|): R|kotlin/Unit| {
+        [BODY_RESOLVE] public 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|)
         }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localDeclaration.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localDeclaration.txt
index 7ffaf523cef..fc179b7c66d 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localDeclaration.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localDeclaration.txt
@@ -1,19 +1,18 @@
-
 RAW_FIR:
 FILE: localDeclaration.kt
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public? final? [RAW_FIR] fun x(): R|kotlin/Unit| {
+            local final? [RAW_FIR] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public? final? [RAW_FIR] val e: <implicit> = IntegerLiteral(2)
+                    [TYPES] [ContainingClassKey=resolveMe] public? get(): <implicit>
 
             }
 
@@ -23,19 +22,19 @@ FILE: localDeclaration.kt
 
 IMPORTS:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -45,19 +44,19 @@ FILE: localDeclaration.kt
 
 SUPER_TYPES:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -67,19 +66,19 @@ FILE: localDeclaration.kt
 
 TYPES:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -89,19 +88,19 @@ FILE: localDeclaration.kt
 
 STATUS:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -111,19 +110,19 @@ FILE: localDeclaration.kt
 
 CONTRACTS:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -133,19 +132,19 @@ FILE: localDeclaration.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -155,19 +154,19 @@ FILE: localDeclaration.kt
 
 BODY_RESOLVE:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
-            local final [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final val e: R|kotlin/Int| = Int(2)
-                    [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -177,19 +176,19 @@ FILE: localDeclaration.kt
 
 NoResolve:
 FILE: localDeclaration.kt
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public? final? [RAW_FIR] fun x(): R|kotlin/Unit| {
+            local final? [RAW_FIR] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public? final? [RAW_FIR] val e: <implicit> = IntegerLiteral(2)
+                    [TYPES] [ContainingClassKey=resolveMe] public? get(): <implicit>
 
             }
 
@@ -199,19 +198,19 @@ FILE: localDeclaration.kt
 
 BodyResolveWithChildren:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
-            local final [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final val e: R|kotlin/Int| = Int(2)
-                    [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -221,19 +220,19 @@ FILE: localDeclaration.kt
 
 AnnotationType:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -243,19 +242,19 @@ FILE: localDeclaration.kt
 
 AnnotationsArguments:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
-            local final [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final val e: R|kotlin/Int| = Int(2)
-                    [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -265,19 +264,19 @@ FILE: localDeclaration.kt
 
 ClassSuperTypes:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -287,19 +286,19 @@ FILE: localDeclaration.kt
 
 DeclarationStatus:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -309,19 +308,19 @@ FILE: localDeclaration.kt
 
 ValueParametersTypes:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -331,19 +330,19 @@ FILE: localDeclaration.kt
 
 TypeParametersTypes:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun x(): R|kotlin/Unit| {
-            local final? [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public? [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public? final? val e: <implicit> = IntegerLiteral(2)
-                    [ContainingClassKey=resolveMe] public? get(): <implicit>
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
@@ -353,19 +352,19 @@ FILE: localDeclaration.kt
 
 FILE RAW TO BODY:
 FILE: localDeclaration.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : R|kotlin/Any| {
+        public [BODY_RESOLVE] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
-        public final fun x(): R|kotlin/Unit| {
-            local final [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
-                public [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
+        public final [BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] [ContainingClassKey=A] class resolveMe : R|kotlin/Any| {
+                public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|A.resolveMe| {
                     super<R|kotlin/Any|>()
                 }
 
-                public final val e: R|kotlin/Int| = Int(2)
-                    [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
+                public final [BODY_RESOLVE] val e: R|kotlin/Int| = Int(2)
+                    [BODY_RESOLVE] [ContainingClassKey=resolveMe] public get(): R|kotlin/Int|
 
             }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localFunction.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localFunction.kt
new file mode 100644
index 00000000000..fd94d31e2bf
--- /dev/null
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localFunction.kt
@@ -0,0 +1,7 @@
+class A {
+    fun x() {
+        fun resolveMe() {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localFunction.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localFunction.txt
new file mode 100644
index 00000000000..4eea5c585cf
--- /dev/null
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localFunction.txt
@@ -0,0 +1,284 @@
+RAW_FIR:
+FILE: localFunction.kt
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public? final? [RAW_FIR] fun x(): R|kotlin/Unit| {
+            local final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+IMPORTS:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+SUPER_TYPES:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+TYPES:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+STATUS:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+CONTRACTS:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+IMPLICIT_TYPES_BODY_RESOLVE:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+BODY_RESOLVE:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+NoResolve:
+FILE: localFunction.kt
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public? final? [RAW_FIR] fun x(): R|kotlin/Unit| {
+            local final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+BodyResolveWithChildren:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+CallableBodyResolve:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+CallableReturnType:
+FILE: localFunction.kt
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public? final? [RAW_FIR] fun x(): R|kotlin/Unit| {
+            local final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+AnnotationType:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+AnnotationsArguments:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+CallableContracts:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+DeclarationStatus:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+ValueParametersTypes:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+TypeParametersTypes:
+FILE: localFunction.kt
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+FILE RAW TO BODY:
+FILE: localFunction.kt
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : R|kotlin/Any| {
+        public [BODY_RESOLVE] [ContainingClassKey=A] constructor(): R|A| {
+            super<R|kotlin/Any|>()
+        }
+
+        public final [BODY_RESOLVE] fun x(): R|kotlin/Unit| {
+            local final [BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/parameterOfLocalSetter.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/parameterOfLocalSetter.txt
index f112c0050fd..a898c8eff36 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/parameterOfLocalSetter.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/parameterOfLocalSetter.txt
@@ -1,14 +1,14 @@
 RAW_FIR:
 FILE: parameterOfLocalSetter.kt
-    public? final? fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public? final? [RAW_FIR] fun ddd(): R|kotlin/Unit| {
+        local final? [RAW_FIR] class XX : R|kotlin/Any| {
+            public? [RAW_FIR] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
+            public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+                [TYPES] [ContainingClassKey=XX] public? get(): Int
+                [RAW_FIR] [ContainingClassKey=XX] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
                     ^ Unit#
                 }
 
@@ -18,16 +18,16 @@ FILE: parameterOfLocalSetter.kt
 
 IMPORTS:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
-                    ^ Unit#
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+                    ^ Q|kotlin/Unit|
                 }
 
         }
@@ -36,16 +36,16 @@ FILE: parameterOfLocalSetter.kt
 
 SUPER_TYPES:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
-                    ^ Unit#
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+                    ^ Q|kotlin/Unit|
                 }
 
         }
@@ -54,16 +54,16 @@ FILE: parameterOfLocalSetter.kt
 
 TYPES:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
-                    ^ Unit#
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+                    ^ Q|kotlin/Unit|
                 }
 
         }
@@ -72,16 +72,16 @@ FILE: parameterOfLocalSetter.kt
 
 STATUS:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
-                    ^ Unit#
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+                    ^ Q|kotlin/Unit|
                 }
 
         }
@@ -90,15 +90,15 @@ FILE: parameterOfLocalSetter.kt
 
 CONTRACTS:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final class XX : R|kotlin/Any| {
-            public [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public final var x: R|kotlin/Int| = Int(2)
-                [ContainingClassKey=XX] public get(): R|kotlin/Int|
-                [ContainingClassKey=XX] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                     ^ Q|kotlin/Unit|
                 }
 
@@ -108,15 +108,15 @@ FILE: parameterOfLocalSetter.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final class XX : R|kotlin/Any| {
-            public [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public final var x: R|kotlin/Int| = Int(2)
-                [ContainingClassKey=XX] public get(): R|kotlin/Int|
-                [ContainingClassKey=XX] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                     ^ Q|kotlin/Unit|
                 }
 
@@ -126,15 +126,15 @@ FILE: parameterOfLocalSetter.kt
 
 BODY_RESOLVE:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final class XX : R|kotlin/Any| {
-            public [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public final var x: R|kotlin/Int| = Int(2)
-                [ContainingClassKey=XX] public get(): R|kotlin/Int|
-                [ContainingClassKey=XX] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                     ^ Q|kotlin/Unit|
                 }
 
@@ -144,15 +144,15 @@ FILE: parameterOfLocalSetter.kt
 
 NoResolve:
 FILE: parameterOfLocalSetter.kt
-    public? final? fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public? final? [RAW_FIR] fun ddd(): R|kotlin/Unit| {
+        local final? [RAW_FIR] class XX : R|kotlin/Any| {
+            public? [RAW_FIR] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
+            public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+                [TYPES] [ContainingClassKey=XX] public? get(): Int
+                [RAW_FIR] [ContainingClassKey=XX] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
                     ^ Unit#
                 }
 
@@ -162,15 +162,15 @@ FILE: parameterOfLocalSetter.kt
 
 BodyResolveWithChildren:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final class XX : R|kotlin/Any| {
-            public [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public final var x: R|kotlin/Int| = Int(2)
-                [ContainingClassKey=XX] public get(): R|kotlin/Int|
-                [ContainingClassKey=XX] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                     ^ Q|kotlin/Unit|
                 }
 
@@ -180,15 +180,15 @@ FILE: parameterOfLocalSetter.kt
 
 CallableBodyResolve:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final class XX : R|kotlin/Any| {
-            public [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public final var x: R|kotlin/Int| = Int(2)
-                [ContainingClassKey=XX] public get(): R|kotlin/Int|
-                [ContainingClassKey=XX] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                     ^ Q|kotlin/Unit|
                 }
 
@@ -198,15 +198,15 @@ FILE: parameterOfLocalSetter.kt
 
 CallableReturnType:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final class XX : R|kotlin/Any| {
-            public [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public final var x: R|kotlin/Int| = Int(2)
-                [ContainingClassKey=XX] public get(): R|kotlin/Int|
-                [ContainingClassKey=XX] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                     ^ Q|kotlin/Unit|
                 }
 
@@ -216,16 +216,16 @@ FILE: parameterOfLocalSetter.kt
 
 AnnotationType:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
-                    ^ Unit#
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+                    ^ Q|kotlin/Unit|
                 }
 
         }
@@ -234,15 +234,15 @@ FILE: parameterOfLocalSetter.kt
 
 AnnotationsArguments:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final class XX : R|kotlin/Any| {
-            public [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public final var x: R|kotlin/Int| = Int(2)
-                [ContainingClassKey=XX] public get(): R|kotlin/Int|
-                [ContainingClassKey=XX] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                     ^ Q|kotlin/Unit|
                 }
 
@@ -252,15 +252,15 @@ FILE: parameterOfLocalSetter.kt
 
 CallableContracts:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final class XX : R|kotlin/Any| {
-            public [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public final var x: R|kotlin/Int| = Int(2)
-                [ContainingClassKey=XX] public get(): R|kotlin/Int|
-                [ContainingClassKey=XX] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                     ^ Q|kotlin/Unit|
                 }
 
@@ -270,16 +270,16 @@ FILE: parameterOfLocalSetter.kt
 
 DeclarationStatus:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
-                    ^ Unit#
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+                    ^ Q|kotlin/Unit|
                 }
 
         }
@@ -288,16 +288,16 @@ FILE: parameterOfLocalSetter.kt
 
 ValueParametersTypes:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
-                    ^ Unit#
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+                    ^ Q|kotlin/Unit|
                 }
 
         }
@@ -306,16 +306,16 @@ FILE: parameterOfLocalSetter.kt
 
 TypeParametersTypes:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? class XX : R|kotlin/Any| {
-            public? [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public? final? var x: Int = IntegerLiteral(2)
-                [ContainingClassKey=XX] public? get(): Int
-                [ContainingClassKey=XX] public? set(resolveMe: Int): R|kotlin/Unit| {
-                    ^ Unit#
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+                    ^ Q|kotlin/Unit|
                 }
 
         }
@@ -324,15 +324,15 @@ FILE: parameterOfLocalSetter.kt
 
 FILE RAW TO BODY:
 FILE: parameterOfLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final class XX : R|kotlin/Any| {
-            public [ContainingClassKey=XX] constructor(): R|XX| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] class XX : R|kotlin/Any| {
+            public [BODY_RESOLVE] [ContainingClassKey=XX] constructor(): R|XX| {
                 super<R|kotlin/Any|>()
             }
 
-            public final var x: R|kotlin/Int| = Int(2)
-                [ContainingClassKey=XX] public get(): R|kotlin/Int|
-                [ContainingClassKey=XX] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+            public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+                [BODY_RESOLVE] [ContainingClassKey=XX] public get(): R|kotlin/Int|
+                [BODY_RESOLVE] [ContainingClassKey=XX] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                     ^ Q|kotlin/Unit|
                 }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/parameterOfNonLocalSetter.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/parameterOfNonLocalSetter.txt
index 6b51a4732e6..a61f5a3d9b2 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/parameterOfNonLocalSetter.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/parameterOfNonLocalSetter.txt
@@ -1,13 +1,13 @@
 RAW_FIR:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [RAW_FIR] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? var x: Int = IntegerLiteral(2)
-            [ContainingClassKey=X] public? get(): Int
-            [ContainingClassKey=X] public? set(resolveMe: Int): R|kotlin/Unit| {
+        public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+            [TYPES] [ContainingClassKey=X] public? get(): Int
+            [RAW_FIR] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -15,14 +15,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 IMPORTS:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [RAW_FIR] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? var x: Int = IntegerLiteral(2)
-            [ContainingClassKey=X] public? get(): Int
-            [ContainingClassKey=X] public? set(resolveMe: Int): R|kotlin/Unit| {
+        public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+            [TYPES] [ContainingClassKey=X] public? get(): Int
+            [RAW_FIR] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -30,14 +30,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 SUPER_TYPES:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [SUPER_TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? var x: Int = IntegerLiteral(2)
-            [ContainingClassKey=X] public? get(): Int
-            [ContainingClassKey=X] public? set(resolveMe: Int): R|kotlin/Unit| {
+        public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+            [TYPES] [ContainingClassKey=X] public? get(): Int
+            [RAW_FIR] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -45,14 +45,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 TYPES:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public? get(): R|kotlin/Int|
-            [ContainingClassKey=X] public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [TYPES] [ContainingClassKey=X] public? get(): R|kotlin/Int|
+            [TYPES] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -60,14 +60,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 STATUS:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [STATUS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -75,14 +75,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 CONTRACTS:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [CONTRACTS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -90,14 +90,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [CONTRACTS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -105,14 +105,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 BODY_RESOLVE:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [BODY_RESOLVE] [ContainingClassKey=X] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Q|kotlin/Unit|
             }
 
@@ -120,14 +120,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 NoResolve:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [RAW_FIR] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? var x: Int = IntegerLiteral(2)
-            [ContainingClassKey=X] public? get(): Int
-            [ContainingClassKey=X] public? set(resolveMe: Int): R|kotlin/Unit| {
+        public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+            [TYPES] [ContainingClassKey=X] public? get(): Int
+            [RAW_FIR] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -135,14 +135,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 BodyResolveWithChildren:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [BODY_RESOLVE] [ContainingClassKey=X] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Q|kotlin/Unit|
             }
 
@@ -150,14 +150,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 CallableBodyResolve:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [BODY_RESOLVE] [ContainingClassKey=X] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Q|kotlin/Unit|
             }
 
@@ -165,14 +165,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 CallableReturnType:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public? get(): R|kotlin/Int|
-            [ContainingClassKey=X] public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [TYPES] [ContainingClassKey=X] public? get(): R|kotlin/Int|
+            [TYPES] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -180,14 +180,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 AnnotationType:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public? get(): R|kotlin/Int|
-            [ContainingClassKey=X] public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [TYPES] [ContainingClassKey=X] public? get(): R|kotlin/Int|
+            [TYPES] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -195,14 +195,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 AnnotationsArguments:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [BODY_RESOLVE] [ContainingClassKey=X] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Q|kotlin/Unit|
             }
 
@@ -210,14 +210,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 CallableContracts:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [CONTRACTS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -225,14 +225,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 DeclarationStatus:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [STATUS] [ContainingClassKey=X] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -240,14 +240,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 ValueParametersTypes:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public? get(): R|kotlin/Int|
-            [ContainingClassKey=X] public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [TYPES] [ContainingClassKey=X] public? get(): R|kotlin/Int|
+            [TYPES] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -255,14 +255,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 TypeParametersTypes:
 FILE: parameterOfNonLocalSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-            [ContainingClassKey=X] public? get(): R|kotlin/Int|
-            [ContainingClassKey=X] public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+            [TYPES] [ContainingClassKey=X] public? get(): R|kotlin/Int|
+            [TYPES] [ContainingClassKey=X] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Unit#
             }
 
@@ -270,14 +270,14 @@ FILE: parameterOfNonLocalSetter.kt
 
 FILE RAW TO BODY:
 FILE: parameterOfNonLocalSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class X : R|kotlin/Any| {
-        public [ContainingClassKey=X] constructor(): R|X| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class X : R|kotlin/Any| {
+        public [BODY_RESOLVE] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final var x: R|kotlin/Int| = Int(2)
-            [ContainingClassKey=X] public get(): R|kotlin/Int|
-            [ContainingClassKey=X] public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+            [BODY_RESOLVE] [ContainingClassKey=X] public get(): R|kotlin/Int|
+            [BODY_RESOLVE] [ContainingClassKey=X] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
                 ^ Q|kotlin/Unit|
             }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithGetter.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithGetter.txt
index c6007a79b26..bd184b1372f 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithGetter.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithGetter.txt
@@ -1,227 +1,227 @@
 RAW_FIR:
 FILE: propertyWithGetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 IMPORTS:
 FILE: propertyWithGetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 SUPER_TYPES:
 FILE: propertyWithGetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 TYPES:
 FILE: propertyWithGetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 STATUS:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 CONTRACTS:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 BODY_RESOLVE:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetter|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val withGetter: R|kotlin/Int|
-        public get(): R|kotlin/Int| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val withGetter: R|kotlin/Int|
+        [STATUS] public get(): R|kotlin/Int| {
             ^ IntegerLiteral(42)
         }
 
 NoResolve:
 FILE: propertyWithGetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 BodyResolveWithChildren:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetter|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val withGetter: R|kotlin/Int|
-        public get(): R|kotlin/Int| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val withGetter: R|kotlin/Int|
+        [STATUS] public get(): R|kotlin/Int| {
             ^ IntegerLiteral(42)
         }
 
 CallableBodyResolve:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetter|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val withGetter: R|kotlin/Int|
-        public get(): R|kotlin/Int| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val withGetter: R|kotlin/Int|
+        [STATUS] public get(): R|kotlin/Int| {
             ^ IntegerLiteral(42)
         }
 
 CallableReturnType:
 FILE: propertyWithGetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 AnnotationType:
 FILE: propertyWithGetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 AnnotationsArguments:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetter|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val withGetter: R|kotlin/Int|
-        public get(): R|kotlin/Int| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val withGetter: R|kotlin/Int|
+        [STATUS] public get(): R|kotlin/Int| {
             ^ IntegerLiteral(42)
         }
 
 CallableContracts:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 DeclarationStatus:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 ValueParametersTypes:
 FILE: propertyWithGetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 TypeParametersTypes:
 FILE: propertyWithGetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetter#)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? val withGetter: Int
-        public? get(): Int {
+    public? final? [RAW_FIR] val withGetter: Int
+        [RAW_FIR] public? get(): Int {
             ^ IntegerLiteral(42)
         }
 
 FILE RAW TO BODY:
 FILE: propertyWithGetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetter|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val withGetter: R|kotlin/Int|
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val withGetter: R|kotlin/Int|
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ Int(42)
         }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithGetterAndSetter.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithGetterAndSetter.txt
index 878250f888b..97c3aa33ae5 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithGetterAndSetter.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithGetterAndSetter.txt
@@ -1,303 +1,303 @@
 RAW_FIR:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 IMPORTS:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 SUPER_TYPES:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 TYPES:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 STATUS:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 CONTRACTS:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 BODY_RESOLVE:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetterAndSetter|)
         R|/withGetterAndSetter| = Int(123)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42)
-        public get(): R|kotlin/Int| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42)
+        [STATUS] public get(): R|kotlin/Int| {
             ^ field#
         }
-        public set(value: R|kotlin/Int|): R|kotlin/Unit| {
+        [STATUS] public set([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| {
             field# = value#
         }
 
 NoResolve:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 BodyResolveWithChildren:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetterAndSetter|)
         R|/withGetterAndSetter| = Int(123)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42)
-        public get(): R|kotlin/Int| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42)
+        [STATUS] public get(): R|kotlin/Int| {
             ^ field#
         }
-        public set(value: R|kotlin/Int|): R|kotlin/Unit| {
+        [STATUS] public set([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| {
             field# = value#
         }
 
 CallableBodyResolve:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetterAndSetter|)
         R|/withGetterAndSetter| = Int(123)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42)
-        public get(): R|kotlin/Int| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42)
+        [STATUS] public get(): R|kotlin/Int| {
             ^ field#
         }
-        public set(value: R|kotlin/Int|): R|kotlin/Unit| {
+        [STATUS] public set([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| {
             field# = value#
         }
 
 CallableReturnType:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 AnnotationType:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 AnnotationsArguments:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetterAndSetter|)
         R|/withGetterAndSetter| = Int(123)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42)
-        public get(): R|kotlin/Int| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var withGetterAndSetter: R|kotlin/Int| = IntegerLiteral(42)
+        [STATUS] public get(): R|kotlin/Int| {
             ^ field#
         }
-        public set(value: R|kotlin/Int|): R|kotlin/Unit| {
+        [STATUS] public set([RAW_FIR] value: R|kotlin/Int|): R|kotlin/Unit| {
             field# = value#
         }
 
 CallableContracts:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 DeclarationStatus:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 ValueParametersTypes:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 TypeParametersTypes:
 FILE: propertyWithGetterAndSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(withGetterAndSetter#)
         withGetterAndSetter# = IntegerLiteral(123)
     }
-    public? final? fun receive(value: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: Int): R|kotlin/Unit| {
     }
-    public? final? var withGetterAndSetter: Int = IntegerLiteral(42)
-        public? get(): Int {
+    public? final? [RAW_FIR] var withGetterAndSetter: Int = IntegerLiteral(42)
+        [RAW_FIR] public? get(): Int {
             ^ field#
         }
-        public? set(value: Int): R|kotlin/Unit| {
+        [RAW_FIR] public? set([RAW_FIR] value: Int): R|kotlin/Unit| {
             field# = value#
         }
 
 FILE RAW TO BODY:
 FILE: propertyWithGetterAndSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/withGetterAndSetter|)
         R|/withGetterAndSetter| = Int(123)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
     }
-    public final [IsReferredViaField=true, ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var withGetterAndSetter: R|kotlin/Int| = Int(42)
-        public get(): R|kotlin/Int| {
+    public final [BODY_RESOLVE] [IsReferredViaField=true, ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var withGetterAndSetter: R|kotlin/Int| = Int(42)
+        [BODY_RESOLVE] public get(): R|kotlin/Int| {
             ^ F|/withGetterAndSetter|
         }
-        public set(value: R|kotlin/Int|): R|kotlin/Unit| {
+        [BODY_RESOLVE] public set([BODY_RESOLVE] value: R|kotlin/Int|): R|kotlin/Unit| {
             F|/withGetterAndSetter| = R|<local>/value|
         }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithInitializer.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithInitializer.txt
index fb8c0613f60..d4846cc803d 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithInitializer.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/propertyWithInitializer.txt
@@ -1,151 +1,151 @@
 RAW_FIR:
 FILE: propertyWithInitializer.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 IMPORTS:
 FILE: propertyWithInitializer.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 SUPER_TYPES:
 FILE: propertyWithInitializer.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 TYPES:
 FILE: propertyWithInitializer.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 STATUS:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 CONTRACTS:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 BODY_RESOLVE:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         <Unresolved name: receive>#(R|/property|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val property: R|kotlin/Int| = IntegerLiteral(10)
-        public get(): R|kotlin/Int|
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val property: R|kotlin/Int| = IntegerLiteral(10)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
 
 NoResolve:
 FILE: propertyWithInitializer.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 BodyResolveWithChildren:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         <Unresolved name: receive>#(R|/property|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val property: R|kotlin/Int| = IntegerLiteral(10)
-        public get(): R|kotlin/Int|
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val property: R|kotlin/Int| = IntegerLiteral(10)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
 
 CallableBodyResolve:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         <Unresolved name: receive>#(R|/property|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val property: R|kotlin/Int| = IntegerLiteral(10)
-        public get(): R|kotlin/Int|
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val property: R|kotlin/Int| = IntegerLiteral(10)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
 
 CallableReturnType:
 FILE: propertyWithInitializer.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 AnnotationType:
 FILE: propertyWithInitializer.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 AnnotationsArguments:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         <Unresolved name: receive>#(R|/property|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] val property: R|kotlin/Int| = IntegerLiteral(10)
-        public get(): R|kotlin/Int|
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] val property: R|kotlin/Int| = IntegerLiteral(10)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
 
 CallableContracts:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 DeclarationStatus:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 ValueParametersTypes:
 FILE: propertyWithInitializer.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 TypeParametersTypes:
 FILE: propertyWithInitializer.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(property#)
     }
-    public? final? val property: Int = IntegerLiteral(10)
-        public? get(): Int
+    public? final? [RAW_FIR] val property: Int = IntegerLiteral(10)
+        [TYPES] public? get(): Int
 
 FILE RAW TO BODY:
 FILE: propertyWithInitializer.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         <Unresolved name: receive>#(R|/property|)
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val property: R|kotlin/Int| = Int(10)
-        public get(): R|kotlin/Int|
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] val property: R|kotlin/Int| = Int(10)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/secondaryConstructor.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/secondaryConstructor.txt
index fcd4a47569b..f74344f15be 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/secondaryConstructor.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/secondaryConstructor.txt
@@ -1,284 +1,284 @@
 RAW_FIR:
 FILE: secondaryConstructor.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 IMPORTS:
 FILE: secondaryConstructor.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 SUPER_TYPES:
 FILE: secondaryConstructor.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 TYPES:
 FILE: secondaryConstructor.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 STATUS:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 CONTRACTS:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 BODY_RESOLVE:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/A.A|(Int(42)))
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|A|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|A|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A, ResolvePhaseWithForAllDeclarationsKey=STATUS] constructor(x: R|kotlin/Int|): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A, ResolvePhaseWithForAllDeclarationsKey=STATUS] constructor([STATUS] x: R|kotlin/Int|): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 NoResolve:
 FILE: secondaryConstructor.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 BodyResolveWithChildren:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/A.A|(Int(42)))
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|A|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|A|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A, ResolvePhaseWithForAllDeclarationsKey=STATUS] constructor(x: R|kotlin/Int|): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A, ResolvePhaseWithForAllDeclarationsKey=STATUS] constructor([STATUS] x: R|kotlin/Int|): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 CallableBodyResolve:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/A.A|(Int(42)))
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|A|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|A|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A, ResolvePhaseWithForAllDeclarationsKey=STATUS] constructor(x: R|kotlin/Int|): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A, ResolvePhaseWithForAllDeclarationsKey=STATUS] constructor([STATUS] x: R|kotlin/Int|): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 CallableReturnType:
 FILE: secondaryConstructor.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 AnnotationType:
 FILE: secondaryConstructor.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 AnnotationsArguments:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/A.A|(Int(42)))
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|A|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|A|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A, ResolvePhaseWithForAllDeclarationsKey=STATUS] constructor(x: R|kotlin/Int|): R|A| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A, ResolvePhaseWithForAllDeclarationsKey=STATUS] constructor([STATUS] x: R|kotlin/Int|): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 CallableContracts:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 DeclarationStatus:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 ValueParametersTypes:
 FILE: secondaryConstructor.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 TypeParametersTypes:
 FILE: secondaryConstructor.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(A#(IntegerLiteral(42)))
     }
-    public? final? fun receive(value: A): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: A): R|kotlin/Unit| {
     }
-    public? final? class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(x: Int): R|A| {
+    public? final? [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor([RAW_FIR] x: Int): R|A| {
             super<R|kotlin/Any|>()
-            lval a: <implicit> = x#
+            [RAW_FIR] lval a: <implicit> = x#
         }
 
     }
 
 FILE RAW TO BODY:
 FILE: secondaryConstructor.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/A.A|(Int(42)))
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive(value: R|A|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|A|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(x: R|kotlin/Int|): R|A| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : R|kotlin/Any| {
+        public [BODY_RESOLVE] [ContainingClassKey=A] constructor([BODY_RESOLVE] x: R|kotlin/Int|): R|A| {
             super<R|kotlin/Any|>()
-            lval a: R|kotlin/Int| = R|<local>/x|
+            [BODY_RESOLVE] lval a: R|kotlin/Int| = R|<local>/x|
         }
 
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/superTypes.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/superTypes.txt
index 0eb108b7057..6ee704e3e94 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/superTypes.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/superTypes.txt
@@ -1,19 +1,19 @@
 RAW_FIR:
 FILE: superTypes.kt
-    public? open class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public? open class resolveMe : A {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [RAW_FIR] class resolveMe : A {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<A>()
         }
 
@@ -21,20 +21,20 @@ FILE: superTypes.kt
 
 IMPORTS:
 FILE: superTypes.kt
-    public? open class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public? open class resolveMe : A {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [RAW_FIR] class resolveMe : A {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<A>()
         }
 
@@ -42,20 +42,20 @@ FILE: superTypes.kt
 
 SUPER_TYPES:
 FILE: superTypes.kt
-    public? open class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public? open [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class resolveMe : R|A| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [SUPER_TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class resolveMe : R|A| {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<A>()
         }
 
@@ -63,20 +63,20 @@ FILE: superTypes.kt
 
 TYPES:
 FILE: superTypes.kt
-    public? open class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public? open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|A| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|A| {
+        public? [TYPES] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -84,20 +84,20 @@ FILE: superTypes.kt
 
 STATUS:
 FILE: superTypes.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=STATUS] class resolveMe : R|A| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] class resolveMe : R|A| {
+        public [STATUS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -105,20 +105,20 @@ FILE: superTypes.kt
 
 CONTRACTS:
 FILE: superTypes.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] class resolveMe : R|A| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] class resolveMe : R|A| {
+        public [CONTRACTS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -126,20 +126,20 @@ FILE: superTypes.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: superTypes.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] class resolveMe : R|A| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [IMPLICIT_TYPES_BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] class resolveMe : R|A| {
+        public [CONTRACTS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -147,20 +147,20 @@ FILE: superTypes.kt
 
 BODY_RESOLVE:
 FILE: superTypes.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|A| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|A| {
+        public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -168,20 +168,20 @@ FILE: superTypes.kt
 
 NoResolve:
 FILE: superTypes.kt
-    public? open class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [RAW_FIR] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public? open class resolveMe : A {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [RAW_FIR] class resolveMe : A {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<A>()
         }
 
@@ -189,20 +189,20 @@ FILE: superTypes.kt
 
 BodyResolveWithChildren:
 FILE: superTypes.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|A| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|A| {
+        public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -210,20 +210,20 @@ FILE: superTypes.kt
 
 AnnotationType:
 FILE: superTypes.kt
-    public? open class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public? open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|A| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|A| {
+        public? [TYPES] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -231,20 +231,20 @@ FILE: superTypes.kt
 
 AnnotationsArguments:
 FILE: superTypes.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|A| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|A| {
+        public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -252,20 +252,20 @@ FILE: superTypes.kt
 
 ClassSuperTypes:
 FILE: superTypes.kt
-    public? open class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public? open [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class resolveMe : R|A| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [SUPER_TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class resolveMe : R|A| {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<A>()
         }
 
@@ -273,20 +273,20 @@ FILE: superTypes.kt
 
 DeclarationStatus:
 FILE: superTypes.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class A : R|kotlin/Any| {
+        public [STATUS] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=STATUS] class resolveMe : R|A| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] class resolveMe : R|A| {
+        public [STATUS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -294,20 +294,20 @@ FILE: superTypes.kt
 
 ValueParametersTypes:
 FILE: superTypes.kt
-    public? open class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public? open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|A| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|A| {
+        public? [TYPES] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -315,20 +315,20 @@ FILE: superTypes.kt
 
 TypeParametersTypes:
 FILE: superTypes.kt
-    public? open class A : R|kotlin/Any| {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public? open class B : A {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : A {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<A>()
         }
 
     }
-    public? open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|A| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|A| {
+        public? [TYPES] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
@@ -336,20 +336,20 @@ FILE: superTypes.kt
 
 FILE RAW TO BODY:
 FILE: superTypes.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : R|kotlin/Any| {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : R|kotlin/Any| {
+        public [BODY_RESOLVE] [ContainingClassKey=A] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class B : R|A| {
-        public [ContainingClassKey=B] constructor(): R|B| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class B : R|A| {
+        public [BODY_RESOLVE] [ContainingClassKey=B] constructor(): R|B| {
             super<R|A|>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|A| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|A| {
+        public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|A|>()
         }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/superTypesLoop.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/superTypesLoop.txt
index dcc7d77f5f2..35b0d36e844 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/superTypesLoop.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/superTypesLoop.txt
@@ -1,25 +1,25 @@
 RAW_FIR:
 FILE: superTypesLoop.kt
-    public? open class resolveMe : C {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [RAW_FIR] class resolveMe : C {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<C>()
         }
 
     }
-    public? open class A : B {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [RAW_FIR] class A : B {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : C {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : C {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public? open class C : A {
-        public? [ContainingClassKey=C] constructor(): R|C| {
+    public? open [RAW_FIR] class C : A {
+        public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| {
             super<A>()
         }
 
@@ -27,26 +27,26 @@ FILE: superTypesLoop.kt
 
 IMPORTS:
 FILE: superTypesLoop.kt
-    public? open class resolveMe : C {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [RAW_FIR] class resolveMe : C {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<C>()
         }
 
     }
-    public? open class A : B {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [RAW_FIR] class A : B {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : C {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : C {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public? open class C : A {
-        public? [ContainingClassKey=C] constructor(): R|C| {
+    public? open [RAW_FIR] class C : A {
+        public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| {
             super<A>()
         }
 
@@ -54,26 +54,26 @@ FILE: superTypesLoop.kt
 
 SUPER_TYPES:
 FILE: superTypesLoop.kt
-    public? open [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class resolveMe : R|C| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [SUPER_TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class resolveMe : R|C| {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<C>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public? open class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public? [ContainingClassKey=C] constructor(): R|C| {
+    public? open [SUPER_TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| {
             super<A>()
         }
 
@@ -81,26 +81,26 @@ FILE: superTypesLoop.kt
 
 TYPES:
 FILE: superTypesLoop.kt
-    public? open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|C| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|C| {
+        public? [TYPES] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public? open class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public? [ContainingClassKey=C] constructor(): R|C| {
+    public? open [SUPER_TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| {
             super<A>()
         }
 
@@ -108,26 +108,26 @@ FILE: superTypesLoop.kt
 
 STATUS:
 FILE: superTypesLoop.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=STATUS] class resolveMe : R|C| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] class resolveMe : R|C| {
+        public [STATUS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public [ContainingClassKey=C] constructor(): R|C| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public [STATUS] [ContainingClassKey=C] constructor(): R|C| {
             super<R|A|>()
         }
 
@@ -135,26 +135,26 @@ FILE: superTypesLoop.kt
 
 CONTRACTS:
 FILE: superTypesLoop.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] class resolveMe : R|C| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] class resolveMe : R|C| {
+        public [CONTRACTS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public [ContainingClassKey=C] constructor(): R|C| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public [STATUS] [ContainingClassKey=C] constructor(): R|C| {
             super<R|A|>()
         }
 
@@ -162,26 +162,26 @@ FILE: superTypesLoop.kt
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: superTypesLoop.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] class resolveMe : R|C| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [IMPLICIT_TYPES_BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] class resolveMe : R|C| {
+        public [CONTRACTS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public [ContainingClassKey=C] constructor(): R|C| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public [STATUS] [ContainingClassKey=C] constructor(): R|C| {
             super<R|A|>()
         }
 
@@ -189,26 +189,26 @@ FILE: superTypesLoop.kt
 
 BODY_RESOLVE:
 FILE: superTypesLoop.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|C| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|C| {
+        public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public [ContainingClassKey=C] constructor(): R|C| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public [STATUS] [ContainingClassKey=C] constructor(): R|C| {
             super<R|A|>()
         }
 
@@ -216,26 +216,26 @@ FILE: superTypesLoop.kt
 
 NoResolve:
 FILE: superTypesLoop.kt
-    public? open class resolveMe : C {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [RAW_FIR] class resolveMe : C {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<C>()
         }
 
     }
-    public? open class A : B {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [RAW_FIR] class A : B {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : C {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [RAW_FIR] class B : C {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public? open class C : A {
-        public? [ContainingClassKey=C] constructor(): R|C| {
+    public? open [RAW_FIR] class C : A {
+        public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| {
             super<A>()
         }
 
@@ -243,26 +243,26 @@ FILE: superTypesLoop.kt
 
 BodyResolveWithChildren:
 FILE: superTypesLoop.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|C| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|C| {
+        public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public [ContainingClassKey=C] constructor(): R|C| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public [STATUS] [ContainingClassKey=C] constructor(): R|C| {
             super<R|A|>()
         }
 
@@ -270,26 +270,26 @@ FILE: superTypesLoop.kt
 
 AnnotationType:
 FILE: superTypesLoop.kt
-    public? open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|C| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|C| {
+        public? [TYPES] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public? open class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public? [ContainingClassKey=C] constructor(): R|C| {
+    public? open [SUPER_TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| {
             super<A>()
         }
 
@@ -297,26 +297,26 @@ FILE: superTypesLoop.kt
 
 AnnotationsArguments:
 FILE: superTypesLoop.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|C| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|C| {
+        public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public [ContainingClassKey=C] constructor(): R|C| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public [STATUS] [ContainingClassKey=C] constructor(): R|C| {
             super<R|A|>()
         }
 
@@ -324,26 +324,26 @@ FILE: superTypesLoop.kt
 
 ClassSuperTypes:
 FILE: superTypesLoop.kt
-    public? open [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class resolveMe : R|C| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [SUPER_TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class resolveMe : R|C| {
+        public? [RAW_FIR] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<C>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public? open class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public? [ContainingClassKey=C] constructor(): R|C| {
+    public? open [SUPER_TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| {
             super<A>()
         }
 
@@ -351,26 +351,26 @@ FILE: superTypesLoop.kt
 
 DeclarationStatus:
 FILE: superTypesLoop.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=STATUS] class resolveMe : R|C| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] class resolveMe : R|C| {
+        public [STATUS] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public [ContainingClassKey=C] constructor(): R|C| {
+    public open [STATUS] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public [STATUS] [ContainingClassKey=C] constructor(): R|C| {
             super<R|A|>()
         }
 
@@ -378,26 +378,26 @@ FILE: superTypesLoop.kt
 
 ValueParametersTypes:
 FILE: superTypesLoop.kt
-    public? open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|C| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|C| {
+        public? [TYPES] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public? open class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public? [ContainingClassKey=C] constructor(): R|C| {
+    public? open [SUPER_TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| {
             super<A>()
         }
 
@@ -405,26 +405,26 @@ FILE: superTypesLoop.kt
 
 TypeParametersTypes:
 FILE: superTypesLoop.kt
-    public? open [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|C| {
-        public? [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public? open [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] class resolveMe : R|C| {
+        public? [TYPES] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public? open class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public? [ContainingClassKey=A] constructor(): R|A| {
+    public? open [SUPER_TYPES] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| {
             super<B>()
         }
 
     }
-    public? open class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public? [ContainingClassKey=B] constructor(): R|B| {
+    public? open [SUPER_TYPES] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| {
             super<C>()
         }
 
     }
-    public? open class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public? [ContainingClassKey=C] constructor(): R|C| {
+    public? open [SUPER_TYPES] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| {
             super<A>()
         }
 
@@ -432,26 +432,26 @@ FILE: superTypesLoop.kt
 
 FILE RAW TO BODY:
 FILE: superTypesLoop.kt
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|C| {
-        public [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class resolveMe : R|C| {
+        public [BODY_RESOLVE] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| {
             super<R|C|>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
-        public [ContainingClassKey=A] constructor(): R|A| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class A : <ERROR TYPE REF: Loop in supertype: /A -> /B> {
+        public [BODY_RESOLVE] [ContainingClassKey=A] constructor(): R|A| {
             super<R|B|>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
-        public [ContainingClassKey=B] constructor(): R|B| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class B : <ERROR TYPE REF: Loop in supertype: /B -> /C> {
+        public [BODY_RESOLVE] [ContainingClassKey=B] constructor(): R|B| {
             super<R|C|>()
         }
 
     }
-    public open [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
-        public [ContainingClassKey=C] constructor(): R|C| {
+    public open [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class C : <ERROR TYPE REF: Loop in supertype: /C -> /A> {
+        public [BODY_RESOLVE] [ContainingClassKey=C] constructor(): R|C| {
             super<R|A|>()
         }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctions.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctions.txt
index bbf1988d0f0..2e31a9aaed7 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctions.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctions.txt
@@ -1,208 +1,208 @@
 RAW_FIR:
 FILE: topLevelFunctions.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 IMPORTS:
 FILE: topLevelFunctions.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 SUPER_TYPES:
 FILE: topLevelFunctions.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 TYPES:
 FILE: topLevelFunctions.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 STATUS:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 CONTRACTS:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 BODY_RESOLVE:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 NoResolve:
 FILE: topLevelFunctions.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 BodyResolveWithChildren:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 CallableBodyResolve:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 CallableReturnType:
 FILE: topLevelFunctions.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 AnnotationType:
 FILE: topLevelFunctions.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 AnnotationsArguments:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 CallableContracts:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 DeclarationStatus:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 ValueParametersTypes:
 FILE: topLevelFunctions.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 TypeParametersTypes:
 FILE: topLevelFunctions.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 FILE RAW TO BODY:
 FILE: topLevelFunctions.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt
index ed1dce3dd2e..bd0f66c45e1 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt
@@ -1,208 +1,208 @@
 RAW_FIR:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 IMPORTS:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 SUPER_TYPES:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 TYPES:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 STATUS:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 CONTRACTS:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 BODY_RESOLVE:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 NoResolve:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 BodyResolveWithChildren:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 CallableBodyResolve:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 CallableReturnType:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 AnnotationType:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 AnnotationsArguments:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 CallableContracts:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 DeclarationStatus:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 ValueParametersTypes:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 TypeParametersTypes:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): String {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): String {
         ^functionWithLazyBody String(42)
     }
 
 FILE RAW TO BODY:
 FILE: topLevelFunctionsWithExpressionBodyAndExplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt
index 3c275b2248c..95e03bb47d1 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt
@@ -1,208 +1,208 @@
 RAW_FIR:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 IMPORTS:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 SUPER_TYPES:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 TYPES:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 STATUS:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 CONTRACTS:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 BODY_RESOLVE:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 NoResolve:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 BodyResolveWithChildren:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 CallableBodyResolve:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 CallableReturnType:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? fun resolveMe(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 AnnotationType:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 AnnotationsArguments:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun receive([STATUS] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
 
 CallableContracts:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 DeclarationStatus:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 ValueParametersTypes:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 TypeParametersTypes:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun resolveMe(): R|kotlin/Unit| {
         receive#(functionWithLazyBody#())
     }
-    public? final? fun receive(value: String): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun receive([RAW_FIR] value: String): R|kotlin/Unit| {
     }
-    public? final? fun functionWithLazyBody(): <implicit> {
+    public? final? [RAW_FIR] fun functionWithLazyBody(): <implicit> {
         ^functionWithLazyBody String(42)
     }
 
 FILE RAW TO BODY:
 FILE: topLevelFunctionsWithImplicitType.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun resolveMe(): R|kotlin/Unit| {
         R|/receive|(R|/functionWithLazyBody|())
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive(value: R|kotlin/String|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun receive([BODY_RESOLVE] value: R|kotlin/String|): R|kotlin/Unit| {
     }
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun functionWithLazyBody(): R|kotlin/String| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun functionWithLazyBody(): R|kotlin/String| {
         ^functionWithLazyBody String(42)
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfLocalFunction.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfLocalFunction.txt
index bd94936191a..1cc9b961b0d 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfLocalFunction.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfLocalFunction.txt
@@ -1,127 +1,127 @@
 RAW_FIR:
 FILE: typeParameterOfLocalFunction.kt
-    public? final? fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun ddd(): R|kotlin/Unit| {
+        local final? [RAW_FIR] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 IMPORTS:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 SUPER_TYPES:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 TYPES:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 STATUS:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 CONTRACTS:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 BODY_RESOLVE:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 NoResolve:
 FILE: typeParameterOfLocalFunction.kt
-    public? final? fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun ddd(): R|kotlin/Unit| {
+        local final? [RAW_FIR] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 BodyResolveWithChildren:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 AnnotationType:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 AnnotationsArguments:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 DeclarationStatus:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 ValueParametersTypes:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 TypeParametersTypes:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun ddd(): R|kotlin/Unit| {
-        local final? fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
 
 FILE RAW TO BODY:
 FILE: typeParameterOfLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
-        local final fun <resolveMe> kkk(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun ddd(): R|kotlin/Unit| {
+        local final [BODY_RESOLVE] fun <resolveMe> kkk(): R|kotlin/Unit| {
         }
 
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfNonLocalFunction.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfNonLocalFunction.txt
index 9c4558664dc..b1dff491e40 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfNonLocalFunction.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfNonLocalFunction.txt
@@ -1,191 +1,191 @@
 RAW_FIR:
 FILE: typeParameterOfNonLocalFunction.kt
-    public? final? class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [RAW_FIR] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 IMPORTS:
 FILE: typeParameterOfNonLocalFunction.kt
-    public? final? class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [RAW_FIR] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 SUPER_TYPES:
 FILE: typeParameterOfNonLocalFunction.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [SUPER_TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 TYPES:
 FILE: typeParameterOfNonLocalFunction.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 STATUS:
 FILE: typeParameterOfNonLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 CONTRACTS:
 FILE: typeParameterOfNonLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: typeParameterOfNonLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 BODY_RESOLVE:
 FILE: typeParameterOfNonLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 NoResolve:
 FILE: typeParameterOfNonLocalFunction.kt
-    public? final? class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [RAW_FIR] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [RAW_FIR] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 BodyResolveWithChildren:
 FILE: typeParameterOfNonLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 AnnotationType:
 FILE: typeParameterOfNonLocalFunction.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 AnnotationsArguments:
 FILE: typeParameterOfNonLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 DeclarationStatus:
 FILE: typeParameterOfNonLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 ValueParametersTypes:
 FILE: typeParameterOfNonLocalFunction.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 TypeParametersTypes:
 FILE: typeParameterOfNonLocalFunction.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
-        public? [ContainingClassKey=X] constructor(): R|X| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=SUPER_TYPES] class X : R|kotlin/Any| {
+        public? [RAW_FIR] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
 
 FILE RAW TO BODY:
 FILE: typeParameterOfNonLocalFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class X : R|kotlin/Any| {
-        public [ContainingClassKey=X] constructor(): R|X| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] class X : R|kotlin/Any| {
+        public [BODY_RESOLVE] [ContainingClassKey=X] constructor(): R|X| {
             super<R|kotlin/Any|>()
         }
 
-        public final fun <resolveMe> ddd(): R|kotlin/Unit| {
+        public final [BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
         }
 
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfTopFunction.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfTopFunction.txt
index 73d818a9c78..19bed5060db 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfTopFunction.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfTopFunction.txt
@@ -1,79 +1,79 @@
 RAW_FIR:
 FILE: typeParameterOfTopFunction.kt
-    public? final? fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 IMPORTS:
 FILE: typeParameterOfTopFunction.kt
-    public? final? fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 SUPER_TYPES:
 FILE: typeParameterOfTopFunction.kt
-    public? final? fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 TYPES:
 FILE: typeParameterOfTopFunction.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 STATUS:
 FILE: typeParameterOfTopFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 CONTRACTS:
 FILE: typeParameterOfTopFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: typeParameterOfTopFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 BODY_RESOLVE:
 FILE: typeParameterOfTopFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 NoResolve:
 FILE: typeParameterOfTopFunction.kt
-    public? final? fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public? final? [RAW_FIR] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 BodyResolveWithChildren:
 FILE: typeParameterOfTopFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 AnnotationType:
 FILE: typeParameterOfTopFunction.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 AnnotationsArguments:
 FILE: typeParameterOfTopFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 DeclarationStatus:
 FILE: typeParameterOfTopFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 ValueParametersTypes:
 FILE: typeParameterOfTopFunction.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 TypeParametersTypes:
 FILE: typeParameterOfTopFunction.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
 
 FILE RAW TO BODY:
 FILE: typeParameterOfTopFunction.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] fun <resolveMe> ddd(): R|kotlin/Unit| {
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfTopSetter.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfTopSetter.txt
index 5085f5ea19b..a3e594bddeb 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfTopSetter.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/typeParameterOfTopSetter.txt
@@ -1,151 +1,151 @@
 RAW_FIR:
 FILE: typeParameterOfTopSetter.kt
-    public? final? var x: Int = IntegerLiteral(2)
-        public? get(): Int
-        public? set(resolveMe: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+        [TYPES] public? get(): Int
+        [RAW_FIR] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
             ^ Unit#
         }
 
 IMPORTS:
 FILE: typeParameterOfTopSetter.kt
-    public? final? var x: Int = IntegerLiteral(2)
-        public? get(): Int
-        public? set(resolveMe: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+        [TYPES] public? get(): Int
+        [RAW_FIR] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
             ^ Unit#
         }
 
 SUPER_TYPES:
 FILE: typeParameterOfTopSetter.kt
-    public? final? var x: Int = IntegerLiteral(2)
-        public? get(): Int
-        public? set(resolveMe: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+        [TYPES] public? get(): Int
+        [RAW_FIR] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
             ^ Unit#
         }
 
 TYPES:
 FILE: typeParameterOfTopSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public? get(): R|kotlin/Int|
-        public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [TYPES] public? get(): R|kotlin/Int|
+        [TYPES] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 STATUS:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [STATUS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 CONTRACTS:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [CONTRACTS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=IMPLICIT_TYPES_BODY_RESOLVE] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [CONTRACTS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 BODY_RESOLVE:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [BODY_RESOLVE] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Q|kotlin/Unit|
         }
 
 NoResolve:
 FILE: typeParameterOfTopSetter.kt
-    public? final? var x: Int = IntegerLiteral(2)
-        public? get(): Int
-        public? set(resolveMe: Int): R|kotlin/Unit| {
+    public? final? [RAW_FIR] var x: Int = IntegerLiteral(2)
+        [TYPES] public? get(): Int
+        [RAW_FIR] public? set([RAW_FIR] resolveMe: Int): R|kotlin/Unit| {
             ^ Unit#
         }
 
 BodyResolveWithChildren:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [BODY_RESOLVE] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Q|kotlin/Unit|
         }
 
 CallableBodyResolve:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [BODY_RESOLVE] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Q|kotlin/Unit|
         }
 
 CallableReturnType:
 FILE: typeParameterOfTopSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public? get(): R|kotlin/Int|
-        public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [TYPES] public? get(): R|kotlin/Int|
+        [TYPES] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 AnnotationType:
 FILE: typeParameterOfTopSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public? get(): R|kotlin/Int|
-        public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [TYPES] public? get(): R|kotlin/Int|
+        [TYPES] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 AnnotationsArguments:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [BODY_RESOLVE] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Q|kotlin/Unit|
         }
 
 CallableContracts:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [CONTRACTS] [ResolvePhaseWithForAllDeclarationsKey=CONTRACTS] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [CONTRACTS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 DeclarationStatus:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=STATUS] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [STATUS] [ResolvePhaseWithForAllDeclarationsKey=STATUS] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [STATUS] public set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 ValueParametersTypes:
 FILE: typeParameterOfTopSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public? get(): R|kotlin/Int|
-        public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [TYPES] public? get(): R|kotlin/Int|
+        [TYPES] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 TypeParametersTypes:
 FILE: typeParameterOfTopSetter.kt
-    public? final? [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
-        public? get(): R|kotlin/Int|
-        public? set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public? final? [TYPES] [ResolvePhaseWithForAllDeclarationsKey=TYPES] var x: R|kotlin/Int| = IntegerLiteral(2)
+        [TYPES] public? get(): R|kotlin/Int|
+        [TYPES] public? set([RAW_FIR] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Unit#
         }
 
 FILE RAW TO BODY:
 FILE: typeParameterOfTopSetter.kt
-    public final [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
-        public get(): R|kotlin/Int|
-        public set(resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
+    public final [BODY_RESOLVE] [ResolvePhaseWithForAllDeclarationsKey=BODY_RESOLVE] var x: R|kotlin/Int| = Int(2)
+        [BODY_RESOLVE] public get(): R|kotlin/Int|
+        [BODY_RESOLVE] public set([BODY_RESOLVE] resolveMe: R|kotlin/Int|): R|kotlin/Unit| {
             ^ Q|kotlin/Unit|
         }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLazyDeclarationResolveTest.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLazyDeclarationResolveTest.kt
index 9d55472f233..5bb55ee7e26 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLazyDeclarationResolveTest.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLazyDeclarationResolveTest.kt
@@ -54,7 +54,7 @@ abstract class AbstractFirLazyDeclarationResolveTest : KotlinLightCodeInsightFix
     fun doTest(path: String) {
         val testDataFile = File(path)
         val ktFile = myFixture.configureByText(testDataFile.name, FileUtil.loadFile(testDataFile)) as KtFile
-
+        val rendererOption = FirRenderer.RenderMode.WithDeclarationAttributes.copy(renderDeclarationResolvePhase = true)
         val resultBuilder = StringBuilder()
         resolveWithClearCaches(ktFile) { firModuleResolveState ->
             check(firModuleResolveState is FirModuleResolveStateImpl)
@@ -66,7 +66,7 @@ abstract class AbstractFirLazyDeclarationResolveTest : KotlinLightCodeInsightFix
                 declarationToResolve.withFirDeclaration(firModuleResolveState, currentPhase) {
                     val firFile = firModuleResolveState.getOrBuildFirFile(ktFile)
                     resultBuilder.append("\n${currentPhase.name}:\n")
-                    resultBuilder.append(firFile.render(FirRenderer.RenderMode.WithDeclarationAttributes))
+                    resultBuilder.append(firFile.render(rendererOption))
                 }
             }
         }
@@ -90,7 +90,7 @@ abstract class AbstractFirLazyDeclarationResolveTest : KotlinLightCodeInsightFix
                 declarationToResolve.withFirDeclaration(resolveType, firModuleResolveState) {
                     val firFile = firModuleResolveState.getOrBuildFirFile(ktFile)
                     resultBuilder.append("\n${resolveType.name}:\n")
-                    resultBuilder.append(firFile.render(FirRenderer.RenderMode.WithDeclarationAttributes))
+                    resultBuilder.append(firFile.render(rendererOption))
                 }
             }
         }
@@ -100,7 +100,7 @@ abstract class AbstractFirLazyDeclarationResolveTest : KotlinLightCodeInsightFix
             val firFile = firModuleResolveState.getOrBuildFirFile(ktFile)
             firFile.withFirDeclaration(firModuleResolveState, FirResolvePhase.BODY_RESOLVE) {
                 resultBuilder.append("\nFILE RAW TO BODY:\n")
-                resultBuilder.append(firFile.render(FirRenderer.RenderMode.WithDeclarationAttributes))
+                resultBuilder.append(firFile.render(rendererOption))
             }
         }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirLazyDeclarationResolveTestGenerated.java b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirLazyDeclarationResolveTestGenerated.java
index 16cbb3fcb8e..fd97b00e356 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirLazyDeclarationResolveTestGenerated.java
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/FirLazyDeclarationResolveTestGenerated.java
@@ -49,6 +49,11 @@ public class FirLazyDeclarationResolveTestGenerated extends AbstractFirLazyDecla
         runTest("idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localDeclaration.kt");
     }
 
+    @TestMetadata("localFunction.kt")
+    public void testLocalFunction() throws Exception {
+        runTest("idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/localFunction.kt");
+    }
+
     @TestMetadata("parameterOfLocalSetter.kt")
     public void testParameterOfLocalSetter() throws Exception {
         runTest("idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/parameterOfLocalSetter.kt");