[FIR] Make FirFile.annotationsContainer nullable

Previously, when no file annotations were present, the FIR element didn't have a source. By making it nullable, it will only be created when appropriate and the source will never be null. #KT-55835
2023-06-26 15:06:13 +03:00
parent 311975f1ed
commit bed6cb7154
334 changed files with 47 additions and 1937 deletions
@@ -28,7 +28,7 @@ class LLFirWholeFileResolveTarget(
    }

    inline fun forEachTopLevelDeclaration(action: (FirElementWithResolveState) -> Unit) {
-        action(firFile.annotationsContainer)
+        firFile.annotationsContainer?.let { action(it) }

        for (member in firFile.declarations) {
            action(member)
@@ -185,11 +185,13 @@ internal class FileStructure private constructor(
            val firFile = moduleComponents.firFileBuilder.buildRawFirFileWithCaching(ktFile)
            firFile.lazyResolveToPhase(FirResolvePhase.IMPORTS)

-            moduleComponents.firModuleLazyDeclarationResolver.lazyResolve(
-                target = firFile.annotationsContainer,
-                scopeSession = moduleComponents.scopeSessionProvider.getScopeSession(),
-                FirResolvePhase.BODY_RESOLVE,
-            )
+            firFile.annotationsContainer?.let {
+                moduleComponents.firModuleLazyDeclarationResolver.lazyResolve(
+                    target = it,
+                    scopeSession = moduleComponents.scopeSessionProvider.getScopeSession(),
+                    FirResolvePhase.BODY_RESOLVE,
+                )
+            }

            RootStructureElement(firFile, container, moduleComponents)
        }
@@ -34,7 +34,7 @@ internal object LLFirResolveMultiDesignationCollector {

    private fun LLFirResolveTarget.withAnnotationContainer(): List<LLFirResolveTarget> {
        val annotationsContainer = firFile.annotationsContainer
-        if (!annotationsContainer.shouldBeResolved()) return listOf(this)
+        if (annotationsContainer?.shouldBeResolved() != true) return listOf(this)
        return buildList {
            add(annotationsContainer.collectDesignationWithFile().asResolveTarget())
            add(this@withAnnotationContainer)
@@ -93,4 +93,4 @@ internal object LLFirResolveMultiDesignationCollector {
            false
        }
    }
-}
+}
@@ -7,7 +7,6 @@ String(y)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgument.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] annotation class Annotation : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Annotation.name] name: R|kotlin/String|): R|Annotation| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ String(y)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentList.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] annotation class Annotation : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Annotation.name] name: R|kotlin/String|): R|Annotation| {
            LAZY_super<R|kotlin/Any|>
@@ -7,6 +7,5 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationCallExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| {
    }
@@ -7,6 +7,5 @@ String(2)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationVarargArgument.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    @R|kotlin/Suppress|[Types](names = vararg(String(1), String(2))) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| {
    }
@@ -7,6 +7,5 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationWithArguments.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| {
    }
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationWithArgumentsOnCallSite.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| {
        [ResolvedTo(BODY_RESOLVE)] lval y: R|kotlin/String| = @R|kotlin/Suppress|[Types](names = vararg(String())) String()
    }
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationOnConstructorProperty.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| {
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=Abc] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/Abc.i] @<ERROR TYPE REF: Symbol not found for Anno>[Types]() i: R|kotlin/Int|): R|Abc| {
            super<R|kotlin/Any|>()
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationOnReturnType.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <reified [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T : R|kotlin/Number|> R|kotlin/String|.collectOfType([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] i: R|kotlin/Int|): <ERROR TYPE REF: Symbol not found for Sequence> {
        ^collectOfType IntegerLiteral(4)
-    }
+    }
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationOnReturnType.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <reified [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T : R|kotlin/Number|> R|kotlin/String|.collectOfType([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] i: R|kotlin/Int|): <ERROR TYPE REF: Symbol not found for Sequence> {
        ^collectOfType IntegerLiteral(4)
    }
@@ -7,5 +7,4 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] danglingAnnotation.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() <DANGLING MODIFIER: Top level declaration expected>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] danglingAnnotationInClass.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] class F : R|kotlin/Any| {
        public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=F] constructor(): R|F| {
            super<R|kotlin/Any|>()
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class MyClass : R|A| {
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/MyClass.addCommaWarning] @<ERROR TYPE REF: Symbol not found for JvmField>[Types]() addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| {
            super<R|A|>()
@@ -23,4 +22,4 @@ FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt
            LAZY_super<R|kotlin/Any|>
        }

-    }
+    }
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class MyClass : R|A| {
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/MyClass.addCommaWarning] addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| {
            super<R|A|>()
@@ -7,7 +7,6 @@ R|kotlin/annotation/AnnotationRetention.SOURCE|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] retentionValue.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    @R|kotlin/annotation/Retention|[Types](value = Q|kotlin/annotation/AnnotationRetention|.R|kotlin/annotation/AnnotationRetention.SOURCE|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] annotation class Anno : R|kotlin/Annotation| {
        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] superCallAnnotation.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] superCallAnnotation2.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameter.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class ResolveMe : R|A| {
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|()  kotlin/Boolean| = Boolean(false)): R|ResolveMe| {
            super<R|A|>()
@@ -7,7 +7,6 @@ String(abc)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class ResolveMe : R|kotlin/Any| {
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(s = String(abc))  kotlin/Boolean| = Boolean(false)): R|ResolveMe| {
            super<R|kotlin/Any|>()
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorProperty.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class ResolveMe : R|A| {
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|()  kotlin/Boolean| = Boolean(false)): R|ResolveMe| {
            super<R|A|>()
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyAndParameter.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class ResolveMe : R|A| {
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|()  kotlin/Boolean| = Boolean(false), [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] second: R|@R|Anno|()  kotlin/Boolean| = Boolean(false)): R|ResolveMe| {
            super<R|A|>()
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyWithArguments.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class ResolveMe : R|A| {
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|(value = String(abc))  kotlin/Boolean| = Boolean(false)): R|ResolveMe| {
            super<R|A|>()
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameter.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun t([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|()  kotlin/Boolean|): R|kotlin/Unit| {
    }
    public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArguments.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun t([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(value = String(abcd))  kotlin/Boolean|): R|kotlin/Unit| {
    }
    public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverFunction.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|@R|Anno|(s = String(ab))  kotlin/Int|.check(): R|kotlin/Int| {
        ^check Int(1)
    }
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverParameter.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun @RECEIVER:R|Anno|[Types](s = String(ab)) R|kotlin/Int|.check(): R|kotlin/Int| {
        ^check Int(1)
    }
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverProperty.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val R|@R|Anno|(s = String(a))  kotlin/Int|.i: R|kotlin/String|
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/String| {
            ^ String()
@@ -7,7 +7,6 @@ R|Anno|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyCall.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val R|@R|Anno|(s = String(a))  kotlin/Int|.i: R|kotlin/String|
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/String| {
            ^ String()
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnFunction.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun check(): R|@R|Anno|(s = String(ab))  kotlin/Int| {
        ^check IntegerLiteral(1)
    }
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnProperty.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val i: R|@R|Anno|(s = String(ab))  kotlin/Int| = Int(1)
        public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|@R|Anno|(s = String(ab))  kotlin/Int|
    @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| {
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] delegate.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] field.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] getter.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] param.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] property.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] setParam.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] setter.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ Int(1)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callArgument.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(CONTRACTS)] fun y([ResolvedTo(CONTRACTS)] a: R|kotlin/Int|): R|kotlin/Unit| {
    }
    public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| {
@@ -7,7 +7,6 @@ R|/foo|()

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallAndExplicitConstructor.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|B| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ R|/foo|()

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallAndImplicitConstructor.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|B| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ R|/foo|(R|<local>/l|)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallFromSecondaryConstructor.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ R|/foo|(R|<local>/i|)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallFromSingleSecondaryConstructor.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ R|kotlin/Int|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] calllTypeArguments.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T> y(): R|kotlin/Unit| {
    }
    public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| {
@@ -7,7 +7,6 @@ R|<local>/l|.R|/A.plusAssign|(Int(1))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignOnVal.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun plusAssign([ResolvedTo(CONTRACTS)] i: R|kotlin/Int|): R|kotlin/Unit|

@@ -7,7 +7,6 @@ R|<local>/l|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignOnVal_lhs.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun plusAssign([ResolvedTo(CONTRACTS)] i: R|kotlin/Int|): R|kotlin/Unit|

@@ -7,7 +7,6 @@ R|<local>/i| = R|<local>/i|.R|kotlin/Int.plus|(Int(1))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignOnVar.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun test(): R|kotlin/Unit| {
        [ResolvedTo(BODY_RESOLVE)] lvar i: R|kotlin/Int| = Int(1)
        R|<local>/i| = R|<local>/i|.R|kotlin/Int.plus|(Int(1))
@@ -7,7 +7,6 @@ R|<local>/i| = R|<local>/i|.R|kotlin/Int.plus|(Int(1))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignOnVar_lhs.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun test(): R|kotlin/Unit| {
        [ResolvedTo(BODY_RESOLVE)] lvar i: R|kotlin/Int| = Int(1)
        R|<local>/i| = R|<local>/i|.R|kotlin/Int.plus|(Int(1))
@@ -7,7 +7,6 @@ R|<local>/<array>|.R|SubstitutionOverride</MyMap.set: R|kotlin/Unit|>|(R|<local>

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignWithArrayAccessConvention.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface MyMap<[ResolvedTo(STATUS)] K, [ResolvedTo(STATUS)] V> : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun get([ResolvedTo(CONTRACTS)] k: R|K|): R|V|

@@ -7,7 +7,6 @@ R|<local>/<array>|.R|SubstitutionOverride</MyMap.get: R|kotlin/Int|>|(R|<local>/

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignWithArrayAccessConvention_lhs.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface MyMap<[ResolvedTo(STATUS)] K, [ResolvedTo(STATUS)] V> : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun get([ResolvedTo(CONTRACTS)] k: R|K|): R|V|

@@ -7,7 +7,6 @@ R|<local>/m|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignWithArrayAccessConvention_propertyAccess.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface MyMap<[ResolvedTo(STATUS)] K, [ResolvedTo(STATUS)] V> : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun get([ResolvedTo(CONTRACTS)] k: R|K|): R|V|

@@ -7,7 +7,6 @@ R|<local>/m|.R|SubstitutionOverride</MyMap.get: R|A|>|(String(a)).R|/A.plusAssig

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignWithArrayGetConvention.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun plusAssign([ResolvedTo(CONTRACTS)] i: R|kotlin/Int|): R|kotlin/Unit|

@@ -7,7 +7,6 @@ R|<local>/m|.R|SubstitutionOverride</MyMap.get: R|A|>|(String(a))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignWithArrayGetConvention_lhs.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun plusAssign([ResolvedTo(CONTRACTS)] i: R|kotlin/Int|): R|kotlin/Unit|

@@ -7,7 +7,6 @@ super<R|B|>(Int(1))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] constructorDelegationSuperCall.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|B| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ this<R|A|>(Int(1))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] constructorDelegationThisCall.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ Int(1)String(2)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] functionCallArgumentList.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(CONTRACTS)] fun callMe([ResolvedTo(CONTRACTS)] x: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] y: R|kotlin/String|): R|kotlin/Unit| {
    }
    public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
@@ -7,7 +7,6 @@ R|<local>/<array>|.R|SubstitutionOverride</MyMap.set: R|kotlin/Unit|>|(R|<local>

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] incWithArrayAccessConvention.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun inc(): R|A|

@@ -7,7 +7,6 @@ R|<local>/m|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] incWithArrayAccessConvention_propertyAccess.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun inc(): R|A|

@@ -7,7 +7,6 @@ R|SubstitutionOverride</MyMap.set: R|kotlin/Unit|>|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] incWithArrayAccessConvention_set.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
        public abstract operator [ResolvedTo(CONTRACTS)] fun inc(): R|A|

@@ -7,7 +7,6 @@ Int(1)String(2)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] invokeCallArgumentList.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] f: R|(kotlin/Int, kotlin/String) -> kotlin/Unit|): R|kotlin/Unit| {
        R|<local>/f|.R|SubstitutionOverride<kotlin/Function2.invoke: R|kotlin/Unit|>|(Int(1), String(2))
    }
@@ -7,7 +7,6 @@ R|<local>/f2|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|><In

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] noReceiverOnLambda.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public? final? [ResolvedTo(RAW_FIR)] class SomeTest : R|kotlin/Any| {
        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SomeTest] constructor(): R|SomeTest| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsidePropertyInsideConstructor.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
        public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/A.i] i: R|() -> kotlin/Unit| = [ResolvedTo(RAW_FIR)] fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
            local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| {
@@ -7,7 +7,6 @@ R|/A.prop|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ Q|B|.R|/A.prop|.R|kotlin/String.toString|()

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall2.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ R|/A.prop|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall3.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
        public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] init: R|A.() -> kotlin/Unit|): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ R|/A.prop|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall4.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ R|/A.prop|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall5.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| {
        public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ Q|A|.R|/A.y|(Int(1))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedCallSelector.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] object A : R|kotlin/Any| {
        private [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ Q|A|.R|/A.y|(Int(1))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] qualifiedWholeCall.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] object A : R|kotlin/Any| {
        private [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ R|test/B.set|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] setOperator.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    package test

    public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
@@ -7,7 +7,6 @@ R|A|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] superType.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| {
    }
    public final [ResolvedTo(BODY_RESOLVE)] class C : R|A| {
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| {
        public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] resolveMe: R|kotlin/Int| = Int(5)): R|X| {
            super<R|kotlin/Any|>()
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] constructorProperty.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| {
        public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Abc.i] i: R|kotlin/Int| = Int(4)): R|Abc| {
            super<R|kotlin/Any|>()
@@ -7,5 +7,4 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] destructionWithNoRValue.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    <ERROR PROPERTY: Destructuring declarations are only allowed for local variables/values>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] destructuring.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public? final? [ResolvedTo(RAW_FIR)] var a: <implicit> = LAZY_EXPRESSION
        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
@@ -7,9 +7,8 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] destructuringEntry.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun main(): R|kotlin/Unit| {
        [ResolvedTo(BODY_RESOLVE)] lval <destruct>: <ERROR TYPE REF: Unresolved name: to> = IntegerLiteral(1).<Unresolved name: to>#(Int(2))
        [ResolvedTo(BODY_RESOLVE)] lval a: <ERROR TYPE REF: Unresolved name: component1> = R|<local>/<destruct>|.<Unresolved name: component1>#()
        [ResolvedTo(BODY_RESOLVE)] lval b: <ERROR TYPE REF: Unresolved name: component2> = R|<local>/<destruct>|.<Unresolved name: component2>#()
-    }
+    }
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] destructuringEntry.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun main(): R|kotlin/Unit| {
        [ResolvedTo(BODY_RESOLVE)] lval <destruct>: R|kotlin/Pair<kotlin/Int, kotlin/Int>| = Int(1).R|kotlin/to|<R|kotlin/Int|, R|kotlin/Int|>(Int(2))
        [ResolvedTo(BODY_RESOLVE)] lval a: R|kotlin/Int| = R|<local>/<destruct>|.R|SubstitutionOverride<kotlin/Pair.component1: R|kotlin/Int|>|()
@@ -8,7 +8,6 @@ private final [ResolvedTo(BODY_RESOLVE)] val branchManager: <ERROR TYPE REF: Sym

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] KotlinFile.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    package one.three

    public final [ResolvedTo(STATUS)] class KotlinFile : R|kotlin/Any| {
@@ -8,7 +8,6 @@ private final [ResolvedTo(BODY_RESOLVE)] val branchManager: R|one/four/Manager?|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] KotlinFile.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    package one.three

    public final [ResolvedTo(STATUS)] class KotlinFile : R|kotlin/Any| {
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] ktij23263.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public? final? [ResolvedTo(RAW_FIR)] class InitOrderDemo : R|kotlin/Any| {
        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=InitOrderDemo] constructor([ResolvedTo(RAW_FIR)] name: String): R|InitOrderDemo| {
            LAZY_super<R|kotlin/Any|>
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] ktij24730.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Any, [ResolvedTo(RAW_FIR)] Z> createTuple([ResolvedTo(RAW_FIR)] a: T, [ResolvedTo(RAW_FIR)] b: ZAny): Pair<T, ZAny> { LAZY_BLOCK }
    public? final? [ResolvedTo(RAW_FIR)] fun main(): R|kotlin/Unit|
    <ERROR PROPERTY: Destructuring declarations are only allowed for local variables/values>
@@ -12,7 +12,6 @@ object : R|kotlin/Any| {

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] objectLiteral.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun test(): R|kotlin/Unit| {
        object : R|kotlin/Any| {
            private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
@@ -12,7 +12,6 @@ object : R|kotlin/Any| {

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] objectLiteralExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun test(): R|kotlin/Unit| {
        object : R|kotlin/Any| {
            private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=<anonymous>] constructor(): R|<anonymous>| {
@@ -10,11 +10,10 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] propertyDelegate.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] val x: <ERROR TYPE REF: Unresolved name: getValue>by <Unresolved name: lazy>#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <anonymous>(): R|kotlin/Int| <inline=Unknown>  {
        ^ Int(1)
    }
    )
        public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: getValue> {
            ^ D|/x|.<Unresolved name: getValue>#(Null(null), ::R|/x|)
-        }
+        }
@@ -10,7 +10,6 @@ R|kotlin/lazy|<R|kotlin/Int|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunc

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] propertyDelegate.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int|by R|kotlin/lazy|<R|kotlin/Int|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/Int| <inline=NoInline>  {
        ^ Int(1)
    }
@@ -10,11 +10,10 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] propertyDelegateExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] val x: <ERROR TYPE REF: Unresolved name: getValue>by <Unresolved name: lazy>#(<L> = [ResolvedTo(RAW_FIR)] lazy@fun <anonymous>(): R|kotlin/Int| <inline=Unknown>  {
        ^ Int(1)
    }
    )
        public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: getValue> {
            ^ D|/x|.<Unresolved name: getValue>#(Null(null), ::R|/x|)
-        }
+        }
@@ -10,7 +10,6 @@ R|kotlin/lazy|<R|kotlin/Int|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunc

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] propertyDelegateExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int|by R|kotlin/lazy|<R|kotlin/Int|>(<L> = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0<T>] lazy@fun <anonymous>(): R|kotlin/Int| <inline=NoInline>  {
        ^ Int(1)
    }
@@ -7,6 +7,5 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] whereClause1.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] From : R|To|, [ResolvedTo(BODY_RESOLVE)] To : R|kotlin/Any|> copyNotNull([ResolvedTo(BODY_RESOLVE)] from: R|kotlin/collections/List<From>|, [ResolvedTo(BODY_RESOLVE)] to: R|kotlin/collections/List<To>|): R|kotlin/Unit| {
    }
@@ -7,6 +7,5 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] whereClause2.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] From : R|To|, [ResolvedTo(BODY_RESOLVE)] To : R|kotlin/Any|> copyNotNull([ResolvedTo(BODY_RESOLVE)] from: R|kotlin/collections/List<From>|, [ResolvedTo(BODY_RESOLVE)] to: R|kotlin/collections/List<To>|): R|kotlin/Unit| {
    }
@@ -7,7 +7,6 @@ R|<local>/x|.R|SubstitutionOverride<kotlin/collections/List.get: R|kotlin/Int|>|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] arrayAccessExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/collections/List<kotlin/Int>|): R|kotlin/Unit| {
        [ResolvedTo(BODY_RESOLVE)] lval a: R|kotlin/Int| = R|<local>/x|.R|SubstitutionOverride<kotlin/collections/List.get: R|kotlin/Int|>|(Int(1))
    }
@@ -7,7 +7,6 @@ Int(0)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] arrayIndexExpressionWithInc.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun main([ResolvedTo(BODY_RESOLVE)] args: R|kotlin/Array<kotlin/String>|): R|kotlin/Unit| {
        [ResolvedTo(BODY_RESOLVE)] lval a: <ERROR TYPE REF: Unresolved name: ArrayList> = <Unresolved name: ArrayList>#<R|kotlin/String|>()
        R|<local>/a|.<Unresolved name: add>#(String())
@@ -16,4 +15,4 @@ FILE: [ResolvedTo(IMPORTS)] arrayIndexExpressionWithInc.kt
        [ResolvedTo(BODY_RESOLVE)] lval <unary>: <ERROR TYPE REF: Unresolved name: get> = R|<local>/<array>|.<Unresolved name: get>#(R|<local>/<index_0>|)
        R|<local>/<array>|.<Unresolved name: set>#(R|<local>/<index_0>|, R|<local>/<unary>|.<Unresolved name: inc>#())
        R|<local>/<unary>|
-    }
+    }
@@ -7,7 +7,6 @@ Int(0)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] arrayIndexExpressionWithInc.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun main([ResolvedTo(BODY_RESOLVE)] args: R|kotlin/Array<kotlin/String>|): R|kotlin/Unit| {
        [ResolvedTo(BODY_RESOLVE)] lval a: R|java/util/ArrayList<kotlin/String>| = R|java/util/ArrayList.ArrayList|<R|kotlin/String|>()
        R|<local>/a|.R|SubstitutionOverride<java/util/ArrayList.add: R|kotlin/Boolean|>|(String())
@@ -7,7 +7,6 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] asExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Any|): R|kotlin/String| {
        ^foo (R|<local>/x| as R|kotlin/String|)
    }
@@ -7,6 +7,5 @@ Int(1).R|kotlin/Int.plus|(Int(1))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] binaryExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| = Int(1).R|kotlin/Int.plus|(Int(1))
        public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int|
@@ -7,6 +7,5 @@ R|kotlin/Int.plus|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] binaryExpressionOperator.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| = Int(1).R|kotlin/Int.plus|(Int(1))
        public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int|
@@ -8,6 +8,5 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] blockExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| {
    }
@@ -7,6 +7,5 @@ Boolean(true)

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] boolLiteral.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Boolean| = Boolean(true)
        public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Boolean|
@@ -7,6 +7,5 @@ FIR element rendered:

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] classAccessExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/reflect/KClass<kotlin/Int>| = <getClass>(Q|kotlin/Int|)
        public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/reflect/KClass<kotlin/Int>|
@@ -12,7 +12,6 @@ while(R|<local>/<iterator>|.R|SubstitutionOverride<kotlin/collections/IntIterato

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] forExpression.kt
-    [ResolvedTo(BODY_RESOLVE)] annotations container
    public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
         {
            [ResolvedTo(BODY_RESOLVE)] lval <iterator>: R|kotlin/collections/IntIterator| = Int(0).R|kotlin/Int.rangeTo|(Int(1)).R|kotlin/ranges/IntProgression.iterator|()
--- a/Show More
+++ b/Show More