diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt
index ecba8a5808e..dafd70c8722 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt
@@ -3,4 +3,4 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|kotlin/Suppress|(names = vararg(String()))
+@R|kotlin/Suppress|[Types](names = vararg(String()))
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt
index 3e79498de8a..76c8aca3db7 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt
@@ -3,4 +3,4 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|kotlin/Suppress|(names = vararg(String()))
+@R|kotlin/Suppress|[Types](names = vararg(String()))
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArgumentsOnCallSite.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArgumentsOnCallSite.txt
index 8e4d5fb285d..76c8aca3db7 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArgumentsOnCallSite.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArgumentsOnCallSite.txt
@@ -3,4 +3,4 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|kotlin/Suppress|(names = vararg(String()))
\ No newline at end of file
+@R|kotlin/Suppress|[Types](names = vararg(String()))
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotation.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotation.txt
index 8e4d5fb285d..76c8aca3db7 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotation.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotation.txt
@@ -3,4 +3,4 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|kotlin/Suppress|(names = vararg(String()))
\ No newline at end of file
+@R|kotlin/Suppress|[Types](names = vararg(String()))
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotationInClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotationInClass.txt
index 8e4d5fb285d..76c8aca3db7 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotationInClass.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotationInClass.txt
@@ -3,4 +3,4 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@R|kotlin/Suppress|(names = vararg(String()))
\ No newline at end of file
+@R|kotlin/Suppress|[Types](names = vararg(String()))
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/fileAnnotation.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/fileAnnotation.txt
index b37d021e5bb..5807d612d22 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/fileAnnotation.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/fileAnnotation.txt
@@ -3,4 +3,4 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-@FILE:R|kotlin/Suppress|(names = vararg(String()))
+@FILE:R|kotlin/Suppress|[Types](names = vararg(String()))
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntry.out_of_src_roots.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntry.out_of_src_roots.txt
index 9fb4600b225..eb7ba8bce69 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntry.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntry.out_of_src_roots.txt
@@ -3,4 +3,4 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-lval a: <ERROR TYPE REF: Unresolved name: component1> = R|<local>/<destruct>|.<Unresolved name: component1>#()
\ No newline at end of file
+[ResolvedTo(BODY_RESOLVE)] lval a: <ERROR TYPE REF: Unresolved name: component1> = R|<local>/<destruct>|.<Unresolved name: component1>#()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntry.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntry.txt
index d4ada0a5818..0d8c4653ea3 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntry.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringEntry.txt
@@ -3,4 +3,4 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-lval a: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
\ No newline at end of file
+[ResolvedTo(BODY_RESOLVE)] lval a: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteral.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteral.txt
index 06a17cc3c7d..4a6a5d143f3 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteral.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteral.txt
@@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
 object : R|kotlin/Any| {
-    private constructor(): R|<anonymous>| {
+    private [ResolvedTo(BODY_RESOLVE)] constructor(): R|<anonymous>| {
         super<R|kotlin/Any|>()
     }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpression.txt
index 623975b3977..8db6a8f8fed 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpression.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpression.txt
@@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
 object : R|kotlin/Any| {
-    private constructor(): R|<anonymous>| {
+    private [ResolvedTo(BODY_RESOLVE)] constructor(): R|<anonymous>| {
         super<R|kotlin/Any|>()
     }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.out_of_src_roots.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.out_of_src_roots.txt
index b5d76f8abd3..6f78b7eed07 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.out_of_src_roots.txt
@@ -3,7 +3,7 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-<Unresolved name: lazy>#(<L> = lazy@fun <anonymous>(): R|kotlin/Int| <inline=Unknown>  {
+<Unresolved name: lazy>#(<L> = [ResolvedTo(BODY_RESOLVE)] lazy@fun <anonymous>(): R|kotlin/Int| <inline=Unknown>  {
     ^ Int(1)
 }
 )
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.txt
index 072e5bf81b1..aaff933b252 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.txt
@@ -3,7 +3,7 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|kotlin/lazy|<R|kotlin/Int|>(<L> = lazy@fun <anonymous>(): R|kotlin/Int| <inline=NoInline>  {
+R|kotlin/lazy|<R|kotlin/Int|>(<L> = [ResolvedTo(BODY_RESOLVE)] lazy@fun <anonymous>(): R|kotlin/Int| <inline=NoInline>  {
     ^ Int(1)
 }
 )
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.out_of_src_roots.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.out_of_src_roots.txt
index f480e9ca287..03f1b22f1af 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.out_of_src_roots.txt
@@ -3,7 +3,7 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-<Unresolved name: lazy>#(<L> = lazy@fun <anonymous>(): R|kotlin/Int| <inline=Unknown>  {
+<Unresolved name: lazy>#(<L> = [ResolvedTo(BODY_RESOLVE)] lazy@fun <anonymous>(): R|kotlin/Int| <inline=Unknown>  {
     ^ Int(1)
 }
 )
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.txt
index 9f5431d4f1c..e6220b254d2 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.txt
@@ -3,7 +3,7 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-R|kotlin/lazy|<R|kotlin/Int|>(<L> = lazy@fun <anonymous>(): R|kotlin/Int| <inline=NoInline>  {
+R|kotlin/lazy|<R|kotlin/Int|>(<L> = [ResolvedTo(BODY_RESOLVE)] lazy@fun <anonymous>(): R|kotlin/Int| <inline=NoInline>  {
     ^ Int(1)
 }
 )
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpression.txt
index d2e155b8264..cffe3c817ce 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpression.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpression.txt
@@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
 while(R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterator.hasNext: R|kotlin/Boolean|>|()) {
-    lval x: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
+    [ResolvedTo(BODY_RESOLVE)] lval x: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
      {
     }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionVariable.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionVariable.txt
index 9d6ee2701b1..15ac51aeb77 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionVariable.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/forExpressionVariable.txt
@@ -3,4 +3,4 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-lval x: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
+[ResolvedTo(BODY_RESOLVE)] lval x: R|kotlin/Int| = R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.out_of_src_roots.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.out_of_src_roots.txt
index 40ff7b68476..2d374ae7930 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.out_of_src_roots.txt
@@ -3,6 +3,6 @@ FIR element: FirAnonymousFunctionExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-run@fun <anonymous>(): R|kotlin/Int| <inline=Unknown>  {
+[ResolvedTo(BODY_RESOLVE)] run@fun <anonymous>(): R|kotlin/Int| <inline=Unknown>  {
     ^ Int(1)
 }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.txt
index 601802396d8..52aeb0bdf0a 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.txt
@@ -3,6 +3,6 @@ FIR element: FirAnonymousFunctionExpressionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-run@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=EXACTLY_ONCE>  {
+[ResolvedTo(BODY_RESOLVE)] run@fun <anonymous>(): R|kotlin/Int| <inline=Inline, kind=EXACTLY_ONCE>  {
     ^ Int(1)
 }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpression.txt
index 623975b3977..8db6a8f8fed 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpression.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpression.txt
@@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
 object : R|kotlin/Any| {
-    private constructor(): R|<anonymous>| {
+    private [ResolvedTo(BODY_RESOLVE)] constructor(): R|<anonymous>| {
         super<R|kotlin/Any|>()
     }
 
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpression.txt
index d8766d2b577..01aa4bb0651 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpression.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpression.txt
@@ -6,7 +6,7 @@ FIR element rendered:
 try {
     Int(1)
 }
-catch (e: R|kotlin/Throwable|) {
+catch ([ResolvedTo(BODY_RESOLVE)] e: R|kotlin/Throwable|) {
 }
 finally {
 }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/delegatedProperty.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/delegatedProperty.txt
index 3c7916cfe5c..6d3db24d2cb 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/delegatedProperty.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/delegatedProperty.txt
@@ -3,7 +3,7 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final val p: R|kotlin/String|by ERROR_EXPR(Should have delegate)
-    public get(): R|kotlin/String| {
+public final [ResolvedTo(BODY_RESOLVE)] val p: R|kotlin/String|by ERROR_EXPR(Should have delegate)
+    public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| {
         ^ D|/p|.<Unresolved name: getValue>#(Null(null), ::R|/p|)
-    }
+    }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeter.txt
index 728126c0d14..5133cb4ba5d 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeter.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeter.txt
@@ -3,4 +3,4 @@ FIR element: FirTypeParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-T
+[ResolvedTo(BODY_RESOLVE)] T
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntry.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntry.txt
index df747f8cead..3ccd9b22f47 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntry.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntry.txt
@@ -3,4 +3,4 @@ FIR element: FirEnumEntryImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final static enum entry ENTRY: R|X|
+public final static [ResolvedTo(BODY_RESOLVE)] enum entry ENTRY: R|X|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/functionTypeParemeter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/functionTypeParemeter.txt
index 728126c0d14..5133cb4ba5d 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/functionTypeParemeter.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/functionTypeParemeter.txt
@@ -3,4 +3,4 @@ FIR element: FirTypeParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-T
+[ResolvedTo(BODY_RESOLVE)] T
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/functionValueParameter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/functionValueParameter.txt
index cf140e24d82..0a5a828bf2c 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/functionValueParameter.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/functionValueParameter.txt
@@ -3,4 +3,4 @@ FIR element: FirValueParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-x: R|kotlin/Int|
+[ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/getter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/getter.txt
index acb5eee08e7..12ae5f892c8 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/getter.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/getter.txt
@@ -3,6 +3,6 @@ FIR element: FirPropertyAccessorImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public get(): R|kotlin/String| {
+public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| {
     ^ String()
-}
+}
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClass.txt
index 7046c4e6094..85a9d771e13 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClass.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClass.txt
@@ -3,11 +3,11 @@ FIR element: FirRegularClassImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-local final class X : R|kotlin/Any| {
-    public constructor(): R|X| {
+local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| {
+    public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| {
         super<R|kotlin/Any|>()
     }
 
-    public final fun y(): R|kotlin/String|
+    public final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/String|
 
-}
+}
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localFunction.txt
index 46ef3f9565e..60a73afd200 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localFunction.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localFunction.txt
@@ -3,6 +3,6 @@ FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-local final fun x(): R|kotlin/String| {
+local final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/String| {
     ^x String()
-}
+}
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localProperty.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localProperty.txt
index 1773b94d4a2..c6796bf5b69 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localProperty.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localProperty.txt
@@ -3,4 +3,4 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-lval x: R|kotlin/String| = String()
+[ResolvedTo(BODY_RESOLVE)] lval x: R|kotlin/String| = String()
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunction.txt
index 6d83ad51472..fc3b77487cc 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunction.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunction.txt
@@ -3,6 +3,6 @@ FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final fun x(): R|kotlin/String| {
+public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/String| {
     ^x String()
-}
+}
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberProperty.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberProperty.txt
index 88e05d1a7a0..b7c7ca31d38 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberProperty.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberProperty.txt
@@ -3,5 +3,5 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final val x: R|kotlin/String| = String()
-    public get(): R|kotlin/String|
+public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/String| = String()
+    public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAlias.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAlias.txt
index 73312c2d7c1..9c02e374c6a 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAlias.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAlias.txt
@@ -3,4 +3,4 @@ FIR element: FirTypeAliasImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final typealias Str = R|kotlin/String|
+public final [ResolvedTo(BODY_RESOLVE)] typealias Str = R|kotlin/String|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClass.txt
index 26c9a2f48f2..4b492cf5858 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClass.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClass.txt
@@ -3,11 +3,11 @@ FIR element: FirRegularClassImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final class X : R|kotlin/Any| {
-    public constructor(): R|Y.X| {
+public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| {
+    public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Y.X| {
         super<R|kotlin/Any|>()
     }
 
-    public final fun y(): R|kotlin/String|
+    public final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/String|
 
-}
+}
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt
index cf140e24d82..0a5a828bf2c 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt
@@ -3,4 +3,4 @@ FIR element: FirValueParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-x: R|kotlin/Int|
+[ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt
index cf140e24d82..0a5a828bf2c 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt
@@ -3,4 +3,4 @@ FIR element: FirValueParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-x: R|kotlin/Int|
+[ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt
index e94a9439fd5..51a32e432ce 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt
@@ -3,4 +3,4 @@ FIR element: FirValueParameterImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-y: R|kotlin/String|
+[ResolvedTo(BODY_RESOLVE)] y: R|kotlin/String|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/setter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/setter.txt
index 199a451ef31..627b879952f 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/setter.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/setter.txt
@@ -3,5 +3,5 @@ FIR element: FirPropertyAccessorImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public set(value: R|kotlin/String|): R|kotlin/Unit| {
-}
+public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|kotlin/Unit| {
+}
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelClass.txt
index dddc76ad2bc..81583db3da9 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelClass.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelClass.txt
@@ -3,11 +3,11 @@ FIR element: FirRegularClassImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final class X : R|kotlin/Any| {
-    public constructor(): R|X| {
+public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| {
+    public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| {
         super<R|kotlin/Any|>()
     }
 
-    public final fun y(): R|kotlin/String|
+    public final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/String|
 
-}
+}
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelFunction.txt
index 53a6c47d94d..71111f8d46e 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelFunction.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelFunction.txt
@@ -3,7 +3,7 @@ FIR element: FirSimpleFunctionImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final fun x(): R|kotlin/Unit| {
-    local final fun y(): R|kotlin/String|
+public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| {
+    local final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/String|
 
-}
+}
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelProperty.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelProperty.txt
index 5581e6ba2ab..e5f549ca312 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelProperty.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelProperty.txt
@@ -3,5 +3,5 @@ FIR element: FirPropertyImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final val x: R|kotlin/Int| = Int(1)
-    public get(): R|kotlin/Int|
+public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| = Int(1)
+    public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelTypelTypeAlias.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelTypelTypeAlias.txt
index 73312c2d7c1..9c02e374c6a 100644
--- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelTypelTypeAlias.txt
+++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelTypelTypeAlias.txt
@@ -3,4 +3,4 @@ FIR element: FirTypeAliasImpl
 FIR source kind: KtRealSourceElementKind
 
 FIR element rendered:
-public final typealias Str = R|kotlin/String|
+public final [ResolvedTo(BODY_RESOLVE)] typealias Str = R|kotlin/String|
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt
index 80f033b1483..71fe580d913 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt
@@ -32,9 +32,9 @@ FILE: [ResolvedTo(RAW_FIR)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -71,9 +71,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -110,9 +110,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -149,9 +149,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -188,9 +188,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -227,9 +227,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|(LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-        @Anno(LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -266,9 +266,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|(LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
-        @R|Anno|(LAZY_EXPRESSION) public final [ResolvedTo(TYPES)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(TYPES)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -305,10 +305,10 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|(X#.A#) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|[Types](X#.A#) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(LAZY_EXPRESSION) public final [ResolvedTo(TYPES)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(TYPES)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -345,10 +345,10 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -385,10 +385,10 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -425,10 +425,10 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|(Q|X|.R|/X.A|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -465,10 +465,10 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|(args = Q|X|.R|/X.A|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -505,10 +505,10 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             LAZY_super<R|kotlin/Any|>
         }
 
-        @R|Anno|(args = Q|X|.R|/X.A|) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
+        @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK }
 
     }
 
@@ -545,10 +545,10 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt
             super<R|kotlin/Any|>()
         }
 
-        @R|Anno|(args = Q|X|.R|/X.A|) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+        @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
         }
 
-        @R|Anno|(args = Q|X|.R|/X.A|) public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
+        @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
         }
 
     }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgument.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgument.txt
index e08b9446cb5..3160966c122 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgument.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgument.txt
@@ -10,7 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @Anno<Int>(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Anno<Int>[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
@@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @Anno<Int>(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Anno<Int>[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
@@ -38,7 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @Anno<Int>(LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Anno<Int>[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
@@ -52,7 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @Anno<Int>(LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Anno<Int>[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
@@ -66,7 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @Anno<Int>(LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Anno<Int>[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
@@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @R|one/Anno<kotlin/Int>|(LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @R|one/Anno<kotlin/Int>|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
@@ -94,7 +94,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @R|one/Anno<kotlin/Int>|(LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @R|one/Anno<kotlin/Int>|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
@@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @R|one/Anno<kotlin/Int>|(<getClass>(Int#)) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| {
+    @R|one/Anno<kotlin/Int>|[Types](<getClass>(Int#)) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 ARGUMENTS_OF_ANNOTATIONS:
@@ -123,7 +123,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @R|one/Anno<kotlin/Int>|(<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| {
+    @R|one/Anno<kotlin/Int>|[Types](<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 CONTRACTS:
@@ -138,7 +138,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @R|one/Anno<kotlin/Int>|(<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
+    @R|one/Anno<kotlin/Int>|[Types](<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
@@ -153,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<T>
 
     }
-    @R|one/Anno<kotlin/Int>|(<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+    @R|one/Anno<kotlin/Int>|[Types](<getClass>(Q|kotlin/Int|)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
@@ -168,7 +168,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public [ResolvedTo(TYPES)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for KClass>
 
     }
-    @R|one/Anno<kotlin/Int>|(value = <getClass>(Q|kotlin/Int|)) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| {
+    @R|one/Anno<kotlin/Int>|[Types](value = <getClass>(Q|kotlin/Int|)) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 BODY_RESOLVE:
@@ -183,7 +183,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public [ResolvedTo(TYPES)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for KClass>
 
     }
-    @R|one/Anno<kotlin/Int>|(value = <getClass>(Q|kotlin/Int|)) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+    @R|one/Anno<kotlin/Int>|[Types](value = <getClass>(Q|kotlin/Int|)) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 FILE RAW TO BODY:
@@ -198,5 +198,5 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt
             public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] get(): <ERROR TYPE REF: Symbol not found for KClass>
 
     }
-    @R|one/Anno<kotlin/Int>|(value = <getClass>(Q|kotlin/Int|)) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+    @R|one/Anno<kotlin/Int>|[Types](value = <getClass>(Q|kotlin/Int|)) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
     }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotations.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotations.txt
index d658e89a6bd..968a9a98480 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/annotations.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotations.txt
@@ -1,91 +1,91 @@
 
 RAW_FIR:
 FILE: [ResolvedTo(RAW_FIR)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @Suppress(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Suppress[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @Suppress(LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Suppress[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @Suppress(LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Suppress[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @Suppress(LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Suppress[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @Suppress(LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @Suppress[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/Suppress|(LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/Suppress|(LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
+    @R|kotlin/Suppress|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
 
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/Suppress|(String(2)) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/Suppress|(String(2)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/Suppress|(String(2)) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(LAZY_EXPRESSION)
+    @FILE:Suppress[Unresolved](LAZY_EXPRESSION)
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/Suppress|(String(2)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|[Types](String(2)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(String(1))
+    @FILE:Suppress[Unresolved](String(1))
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/Suppress|(names = vararg(String(2))) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:Suppress(String(1))
+    @FILE:Suppress[Unresolved](String(1))
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/Suppress|(names = vararg(String(2))) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
     }
 
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotations.kt
-    @FILE:R|kotlin/Suppress|(names = vararg(String(1)))
+    @FILE:R|kotlin/Suppress|[Types](names = vararg(String(1)))
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    @R|kotlin/Suppress|(names = vararg(String(2))) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
+    @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
     }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClass.txt
index 21d66809cb2..70ccf4c69bf 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClass.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClass.txt
@@ -2,7 +2,7 @@
 RAW_FIR:
 FILE: [ResolvedTo(RAW_FIR)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @JvmInline() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+    @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -17,7 +17,7 @@ FILE: [ResolvedTo(RAW_FIR)] functionInValueClass.kt
 IMPORTS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @JvmInline() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+    @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 COMPILER_REQUIRED_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @JvmInline() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+    @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -47,7 +47,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 COMPANION_GENERATION:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @JvmInline() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+    @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 SUPER_TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @JvmInline() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
+    @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| {
         public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -77,7 +77,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 TYPES:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/jvm/JvmInline|() public? final? inline [ResolvedTo(SUPER_TYPES)] class Value : R|kotlin/Any| {
+    @R|kotlin/jvm/JvmInline|[Types]() public? final? inline [ResolvedTo(SUPER_TYPES)] class Value : R|kotlin/Any| {
         public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Value] constructor([ResolvedTo(SUPER_TYPES)] [CorrespondingProperty=/Value.value] value: Int): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 STATUS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/jvm/JvmInline|() public final inline [ResolvedTo(SUPER_TYPES)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
+    @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(SUPER_TYPES)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
         public [ResolvedTo(TYPES)] [ContainingClassKey=Value] constructor([ResolvedTo(TYPES)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -107,7 +107,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 EXPECT_ACTUAL_MATCHING:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/jvm/JvmInline|() public final inline [ResolvedTo(SUPER_TYPES)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
+    @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(SUPER_TYPES)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
         public [ResolvedTo(TYPES)] [ContainingClassKey=Value] constructor([ResolvedTo(TYPES)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -123,7 +123,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 ARGUMENTS_OF_ANNOTATIONS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/jvm/JvmInline|() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
+    @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -139,7 +139,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 CONTRACTS:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/jvm/JvmInline|() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
+    @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -155,7 +155,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 IMPLICIT_TYPES_BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/jvm/JvmInline|() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
+    @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -171,7 +171,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 ANNOTATIONS_ARGUMENTS_MAPPING:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/jvm/JvmInline|() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
+    @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -187,7 +187,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(RAW_FIR)] annotations container
-    @R|kotlin/jvm/JvmInline|() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
+    @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
         public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
             LAZY_super<R|kotlin/Any|>
         }
@@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
 FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt
     [ResolvedTo(BODY_RESOLVE)] annotations container
-    @R|kotlin/jvm/JvmInline|() public final inline [ResolvedTo(BODY_RESOLVE)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
+    @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(BODY_RESOLVE)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| {
         public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Value] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| {
             super<R|kotlin/Any|>()
         }
diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt
index 4aee9689ff4..cb041fee422 100644
--- a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt
+++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt
@@ -13,7 +13,7 @@ FILE: [ResolvedTo(RAW_FIR)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @Anno() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
+        @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
         public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
         }
 
@@ -39,7 +39,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @Anno() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
+        @Anno[Unresolved]() public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
         public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
         }
 
@@ -65,7 +65,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @Anno() public final static [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
+        @Anno[Unresolved]() public final static [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
         public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
         }
 
@@ -91,7 +91,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @Anno() public final static [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
+        @Anno[Unresolved]() public final static [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
         public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
         }
 
@@ -117,7 +117,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @Anno() public final static [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
+        @Anno[Unresolved]() public final static [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
         public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
         }
 
@@ -143,7 +143,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @R|Anno|() public final static [ResolvedTo(TYPES)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
+        @R|Anno|[Types]() public final static [ResolvedTo(TYPES)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
         public final static [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
         }
 
@@ -169,7 +169,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @R|Anno|() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
+        @R|Anno|[Types]() public final static [ResolvedTo(STATUS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = LAZY_EXPRESSION
         public final static [ResolvedTo(TYPES)] [ContainingClassKey=Foo] fun values(): R|kotlin/Array<Foo>| {
         }
 
@@ -195,7 +195,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @R|Anno|() public final static [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+        @R|Anno|[Types]() public final static [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                 super<R|Foo|>()
             }
@@ -227,7 +227,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @R|Anno|() public final static [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+        @R|Anno|[Types]() public final static [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                 super<R|Foo|>()
             }
@@ -259,7 +259,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @R|Anno|() public final static [ResolvedTo(CONTRACTS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+        @R|Anno|[Types]() public final static [ResolvedTo(CONTRACTS)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                 super<R|Foo|>()
             }
@@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @R|Anno|() public final static [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+        @R|Anno|[Types]() public final static [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                 super<R|Foo|>()
             }
@@ -323,7 +323,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @R|Anno|() public final static [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+        @R|Anno|[Types]() public final static [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
             private [ResolvedTo(RAW_FIR)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                 super<R|Foo|>()
             }
@@ -355,7 +355,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             LAZY_super<R|kotlin/Enum<Foo>|>
         }
 
-        @R|Anno|() public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+        @R|Anno|[Types]() public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
             private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                 super<R|Foo|>()
             }
@@ -387,7 +387,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt
             super<R|kotlin/Enum<Foo>|>()
         }
 
-        @R|Anno|() public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
+        @R|Anno|[Types]() public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] enum entry ResolveMe: R|Foo| = object : R|Foo| {
             private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
                 super<R|Foo|>()
             }
diff --git a/analysis/low-level-api-fir/testdata/onAirResolve/fileAnnotation.txt b/analysis/low-level-api-fir/testdata/onAirResolve/fileAnnotation.txt
index 561b0ba39c7..f37bd09c618 100644
--- a/analysis/low-level-api-fir/testdata/onAirResolve/fileAnnotation.txt
+++ b/analysis/low-level-api-fir/testdata/onAirResolve/fileAnnotation.txt
@@ -1 +1 @@
-@FILE:R|kotlin/Deprecated|(message = String(hello))
+@FILE:R|kotlin/Deprecated|[Types](message = String(hello))
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt
index 3246e3fe1e9..8b4d57ef0f6 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -85,7 +85,11 @@ abstract class AbstractFirLazyDeclarationResolveTest : AbstractLowLevelApiSingle
             check(llSession.isSourceSession)
             val firFile = llSession.getOrBuildFirFile(ktFile)
             firFile.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE)
-            resultBuilder.append("\nFILE RAW TO BODY:\n")
+            if (resultBuilder.isNotEmpty()) {
+                resultBuilder.appendLine()
+            }
+
+            resultBuilder.append("FILE RAW TO BODY:\n")
             renderer.renderElementAsString(firFile)
         }
 
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt
index 589e66e0640..713f591e2d1 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -14,8 +14,10 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.Analys
 import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.declarations.FirImport
+import org.jetbrains.kotlin.fir.renderer.FirFileAnnotationsContainerRenderer
 import org.jetbrains.kotlin.fir.renderer.FirPackageDirectiveRenderer
 import org.jetbrains.kotlin.fir.renderer.FirRenderer
+import org.jetbrains.kotlin.fir.renderer.FirResolvePhaseRenderer
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
@@ -42,7 +44,7 @@ abstract class AbstractGetOrBuildFirTest : AbstractLowLevelApiSingleFileTest() {
                |FIR source kind: ${fir?.source?.kind?.let { it::class.simpleName }}
                |
                |FIR element rendered:
-               |${render(fir)}""".trimMargin()
+               |${render(fir).trimEnd()}""".trimMargin()
         }
         testServices.assertions.assertEqualsToTestDataFileSibling(actual)
     }
@@ -61,7 +63,11 @@ abstract class AbstractGetOrBuildFirTest : AbstractLowLevelApiSingleFileTest() {
     private fun render(firElement: FirElement?): String = when (firElement) {
         null -> "null"
         is FirImport -> "import ${firElement.importedFqName}"
-        else -> FirRenderer(packageDirectiveRenderer = FirPackageDirectiveRenderer()).renderElementAsString(firElement)
+        else -> FirRenderer(
+            fileAnnotationsContainerRenderer = FirFileAnnotationsContainerRenderer(),
+            packageDirectiveRenderer = FirPackageDirectiveRenderer(),
+            resolvePhaseRenderer = FirResolvePhaseRenderer(),
+        ).renderElementAsString(firElement)
     }
 
     private object Directives : SimpleDirectivesContainer() {
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirAnnotationRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirAnnotationRenderer.kt
index a443aec3034..a303cb8e632 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirAnnotationRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirAnnotationRenderer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -38,10 +38,13 @@ open class FirAnnotationRenderer {
 
         annotation.annotationTypeRef.accept(visitor)
         when (annotation) {
-            is FirAnnotationCall -> if (annotation.calleeReference.let { it is FirResolvedNamedReference || it is FirErrorNamedReference }) {
-                callArgumentsRenderer?.renderArgumentMapping(annotation.argumentMapping)
-            } else {
-                visitor.visitCall(annotation)
+            is FirAnnotationCall -> {
+                components.resolvePhaseRenderer?.render(annotation)
+                if (annotation.calleeReference.let { it is FirResolvedNamedReference || it is FirErrorNamedReference }) {
+                    callArgumentsRenderer?.renderArgumentMapping(annotation.argumentMapping)
+                } else {
+                    visitor.visitCall(annotation)
+                }
             }
 
             else -> callArgumentsRenderer?.renderArgumentMapping(annotation.argumentMapping)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirResolvePhaseRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirResolvePhaseRenderer.kt
index 2175eca903e..23f693775f6 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirResolvePhaseRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirResolvePhaseRenderer.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.renderer
 
 import org.jetbrains.kotlin.fir.FirElementWithResolveState
 import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess
+import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 
 class FirResolvePhaseRenderer {
     internal lateinit var components: FirRendererComponents
@@ -16,4 +17,8 @@ class FirResolvePhaseRenderer {
         @OptIn(ResolveStateAccess::class)
         printer.print("[${element.resolveState}] ")
     }
+
+    fun render(element: FirAnnotationCall) {
+        printer.print("[${element.annotationResolvePhase}]")
+    }
 }
\ No newline at end of file