[LL FIR] support scripts in BODY_RESOLVE transformer

^KT-60728
2023-07-29 01:47:51 +02:00
parent 6cb1142210
commit 97e330997b
161 changed files with 1766 additions and 1025 deletions
@@ -5,6 +5,7 @@

 package org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve

+import org.jetbrains.kotlin.analysis.low.level.api.fir.util.isScriptStatement
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirElementWithResolveState
 import org.jetbrains.kotlin.fir.declarations.*
@@ -19,7 +20,7 @@ internal object LLFirPhaseUpdater {
    ) {
        updatePhaseForNonLocals(target, newPhase, isTargetDeclaration = true)

-        if (updateForLocalDeclarations && target is FirCallableDeclaration) {
+        if (updateForLocalDeclarations) {
            when (target) {
                is FirFunction -> target.body?.accept(PhaseUpdatingTransformer, newPhase)
                is FirVariable -> {
@@ -28,6 +29,14 @@ internal object LLFirPhaseUpdater {
                    target.setter?.body?.accept(PhaseUpdatingTransformer, newPhase)
                    target.backingField?.accept(PhaseUpdatingTransformer, newPhase)
                }
+
+                is FirScript -> {
+                    target.parameters.forEach { it.accept(PhaseUpdatingTransformer, newPhase) }
+                    for (statement in target.statements) {
+                        if (!statement.isScriptStatement) continue
+                        statement.accept(PhaseUpdatingTransformer, newPhase)
+                    }
+                }
            }
        }
    }
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.fir.references.FirSuperReference
 import org.jetbrains.kotlin.fir.references.FirThisReference
 import org.jetbrains.kotlin.fir.references.builder.buildExplicitSuperReference
 import org.jetbrains.kotlin.fir.references.builder.buildExplicitThisReference
+import org.jetbrains.kotlin.fir.resolve.ResolutionMode
 import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.resolve.dfa.FirControlFlowGraphReferenceImpl
 import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirBodyResolveTransformer
@@ -37,6 +38,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.contracts.FirContractsDslNa
 import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
 import org.jetbrains.kotlin.fir.resolve.dfa.cfg.isUsedInControlFlowGraphBuilderForClass
+import org.jetbrains.kotlin.fir.visitors.transformSingle

 internal object LLFirBodyLazyResolver : LLFirLazyResolver(FirResolvePhase.BODY_RESOLVE) {
    override fun resolve(
@@ -142,7 +144,7 @@ private class LLFirBodyTargetResolver(
            is FirField -> resolve(target, BodyStateKeepers.FIELD)
            is FirVariable -> resolve(target, BodyStateKeepers.VARIABLE)
            is FirAnonymousInitializer -> resolve(target, BodyStateKeepers.ANONYMOUS_INITIALIZER)
-            is FirScript,
+            is FirScript -> resolve(target, BodyStateKeepers.SCRIPT)
            is FirDanglingModifierList,
            is FirFileAnnotationsContainer,
            is FirTypeAlias,
@@ -152,6 +154,22 @@ private class LLFirBodyTargetResolver(
            else -> throwUnexpectedFirElementError(target)
        }
    }
+
+    override fun rawResolve(target: FirElementWithResolveState) {
+        if (target !is FirScript) return super.rawResolve(target)
+
+        transformer.declarationsTransformer.withScript(target) {
+            target.parameters.forEach { it.transformSingle(transformer, ResolutionMode.ContextIndependent) }
+            target.statements.forEach {
+                if (it.isScriptStatement) {
+                    transformer.firResolveContextCollector?.addStatementContext(it, transformer.context)
+                    it.transformSingle(transformer, ResolutionMode.ContextIndependent)
+                }
+            }
+
+            target
+        }
+    }
 }

 internal object BodyStateKeepers {
@@ -196,7 +196,9 @@ val FirDeclaration.isGeneratedDeclaration

 internal inline fun FirScript.forEachDeclaration(action: (FirDeclaration) -> Unit) {
    for (statement in statements) {
-        if (statement !is FirDeclaration || statement.origin is FirDeclarationOrigin.ScriptCustomization) continue
-        action(statement)
+        if (statement.isScriptStatement) continue
+        action(statement as FirDeclaration)
    }
 }
+
+internal val FirStatement.isScriptStatement: Boolean get() = this !is FirDeclaration || origin is FirDeclarationOrigin.ScriptCustomization
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] classMemberPropertyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] classScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] constructorsScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Int|): R|A| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] danglingAnnotationClassLevelScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class Foo : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Foo| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] declarationsInPropertyInitScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] enumClassScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] enum class A : R|kotlin/Enum<A>| {
            private [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] enumClassWithBodyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] enum class A : R|kotlin/Enum<A>| {
            private [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] initBlockScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] localClassScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun a(): R|kotlin/Unit| {
            local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] localFunScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| {
            local final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/Unit| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] localPropertyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
            [ResolvedTo(BODY_RESOLVE)] lvar x: R|kotlin/Int|
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] memberTypeAliasScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] nestedClassesScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] propertyAccessorsScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(10)
            public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class Builder : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Builder| {
@@ -26,19 +26,19 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
            ^build2 R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
        }

-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| {
                    super<R|kotlin/Any|>()
                }

-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                }

            }

-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
        }
        )
        public final [ResolvedTo(BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(BODY_RESOLVE)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
@@ -47,6 +47,6 @@ FILE: [ResolvedTo(IMPORTS)] script.kts
        )
            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>

-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = builder#.execute#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: <ERROR TYPE REF: Unresolved name: execute> = R|/builder|.<Unresolved name: execute>#()
+            public [ResolvedTo(BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: execute>

@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] superClassCallScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public open [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] init: R|A.() -> kotlin/Unit|): R|A| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelExpressionBodyFunWithTypeScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| {
            ^foo Int(42)
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelExpressionBodyFunWithoutTypeScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| {
            ^foo Int(42)
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelFunWithTypeScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| {
            <Unresolved name: println>#(String())
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelPropertyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int|
            public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| {
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] topLevelUnitFunScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| {
            <Unresolved name: println>#(String())
@@ -1,7 +1,7 @@
 FILE: [ResolvedTo(IMPORTS)] withoutNameScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun <no name provided>([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Int| = Int(1)): R|kotlin/String| {
            ^<no name provided> String(str)
@@ -9,20 +9,20 @@ FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentOnStatement.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-        @Target[Unresolved](AnnotationTarget#.EXPRESSION#) @Retention[Unresolved](AnnotationRetention#.SOURCE#) public final? [ResolvedTo(RAW_FIR)] annotation class Annotation : R|kotlin/Annotation| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Annotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Annotation.name] name: String): R|Annotation| {
+        @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.EXPRESSION|) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) 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| {
                super<R|kotlin/Any|>()
            }

-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val name: String = R|<local>/name|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Annotation] get(): String
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val name: R|kotlin/String| = R|<local>/name|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] get(): R|kotlin/String|

        }

-        public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| {
+        public final [ResolvedTo(CONTRACTS)] fun x(): R|kotlin/Unit| {
        }

-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = @Annotation[Unresolved](String(y)) x#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|kotlin/Unit| = @R|Annotation|[Types](name = String(y)) R|/x|()
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Unit|
@@ -3,16 +3,16 @@ FIR element: FirAnnotationCallImpl
 FIR source kind: KtRealSourceElementKind

 FIR element rendered:
-@Suppress[Unresolved](String())
+@R|kotlin/Suppress|[Types](names = vararg(String()))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] statementAnnotation.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-        public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| {
+        public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| {
        }

-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> = @Suppress[Unresolved](String()) foo#()
-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|kotlin/Unit| = @R|kotlin/Suppress|[Types](names = vararg(String())) R|/foo|()
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Unit|
@@ -5,22 +5,22 @@ FIR source kind: KtRealSourceElementKind
 FIR element rendered:
 context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
 SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-    [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-    public? final? [ResolvedTo(RAW_FIR)] var i: <implicit> = IntegerLiteral(1)
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var i: R|kotlin/Int| = Int(1)
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit|

-    +=(i#, IntegerLiteral(1))
+    +=(R|/i|, Int(1))

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] compoundAssignOnVarScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-        public? final? [ResolvedTo(RAW_FIR)] var i: <implicit> = IntegerLiteral(1)
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var i: R|kotlin/Int| = Int(1)
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int|
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit|

-        +=(i#, IntegerLiteral(1))
+        +=(R|/i|, Int(1))
@@ -1,82 +1,47 @@
 KT element: KtArrayAccessExpression
-FIR element: FirScriptImpl
+FIR element: FirResolvedNamedReferenceImpl
 FIR source kind: KtRealSourceElementKind

 FIR element rendered:
-context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-    [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
-
-    public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=test/B.n] n: Int): R|test/B| {
-            super<R|kotlin/Any|>()
-        }
-
-        public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val n: Int = R|<local>/n|
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] get(): Int
-
-        public? final? operator [ResolvedTo(RAW_FIR)] fun set([ResolvedTo(RAW_FIR)] i: Int, [ResolvedTo(RAW_FIR)] a: B): R|kotlin/Unit| {
-        }
-
-        public? final? operator [ResolvedTo(RAW_FIR)] fun get([ResolvedTo(RAW_FIR)] i: Int): B {
-        }
-
-        public? final? operator [ResolvedTo(RAW_FIR)] fun inc(): B {
-        }
-
-    }
-
-    public? final? [ResolvedTo(RAW_FIR)] var a: <implicit> = B#(IntegerLiteral(1))
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-        public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
-
-    public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> =  {
-        [ResolvedTo(RAW_FIR)] lval <array>: <implicit> = a#
-        [ResolvedTo(RAW_FIR)] lval <index_0>: <implicit> = IntegerLiteral(2)
-        [ResolvedTo(RAW_FIR)] lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
-        R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
-        R|<local>/<unary>|
-    }
-
-        public [ResolvedTo(RAW_FIR)] get(): <implicit>
+R|test/B.set|

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] setOperatorScript.kts
    package test

    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-        public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=test/B.n] n: Int): R|test/B| {
+        public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=test/B.n] n: R|kotlin/Int|): R|test/B| {
                super<R|kotlin/Any|>()
            }

-            public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val n: Int = R|<local>/n|
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] get(): Int
+            public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val n: R|kotlin/Int| = R|<local>/n|
+                public [ResolvedTo(STATUS)] [ContainingClassKey=B] get(): R|kotlin/Int|

-            public? final? operator [ResolvedTo(RAW_FIR)] fun set([ResolvedTo(RAW_FIR)] i: Int, [ResolvedTo(RAW_FIR)] a: B): R|kotlin/Unit| {
+            public final operator [ResolvedTo(CONTRACTS)] fun set([ResolvedTo(CONTRACTS)] i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] a: R|test/B|): R|kotlin/Unit| {
            }

-            public? final? operator [ResolvedTo(RAW_FIR)] fun get([ResolvedTo(RAW_FIR)] i: Int): B {
+            public final operator [ResolvedTo(CONTRACTS)] fun get([ResolvedTo(CONTRACTS)] i: R|kotlin/Int|): R|test/B| {
            }

-            public? final? operator [ResolvedTo(RAW_FIR)] fun inc(): B {
+            public final operator [ResolvedTo(CONTRACTS)] fun inc(): R|test/B| {
            }

        }

-        public? final? [ResolvedTo(RAW_FIR)] var a: <implicit> = B#(IntegerLiteral(1))
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
-            public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: <implicit>): R|kotlin/Unit|
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var a: R|test/B| = R|test/B.B|(Int(1))
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|test/B|
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] value: R|test/B|): R|kotlin/Unit|

-        public final [ResolvedTo(RAW_FIR)] val $$result: <implicit> =  {
-            [ResolvedTo(RAW_FIR)] lval <array>: <implicit> = a#
-            [ResolvedTo(RAW_FIR)] lval <index_0>: <implicit> = IntegerLiteral(2)
-            [ResolvedTo(RAW_FIR)] lval <unary>: <implicit> = R|<local>/<array>|.get#(R|<local>/<index_0>|)
-            R|<local>/<array>|.set#(R|<local>/<index_0>|, R|<local>/<unary>|.inc#())
+        public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|test/B| =  {
+            [ResolvedTo(BODY_RESOLVE)] lval <array>: R|test/B| = R|test/a|
+            [ResolvedTo(BODY_RESOLVE)] lval <index_0>: R|kotlin/Int| = Int(2)
+            [ResolvedTo(BODY_RESOLVE)] lval <unary>: R|test/B| = R|<local>/<array>|.R|test/B.get|(R|<local>/<index_0>|)
+            R|<local>/<array>|.R|test/B.set|(R|<local>/<index_0>|, R|<local>/<unary>|.R|test/B.inc|())
            R|<local>/<unary>|
        }

-            public [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(BODY_RESOLVE)] get(): R|test/B|
@@ -9,47 +9,47 @@ FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] assignment.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                super<R|kotlin/Any|>()
            }

-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|

-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                println#(version#)
            }

        }

-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
        }

-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                    super<R|kotlin/Any|>()
                }

-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                }

            }

-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
        }
        )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
        }
        )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>

-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
@@ -3,53 +3,53 @@ FIR element: FirFunctionCallImpl
 FIR source kind: KtRealSourceElementKind

 FIR element rendered:
-execute#()
+this@R|special/anonymous|.R|/Builder.execute|()

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] callInsideStatement.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-        public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                super<R|kotlin/Any|>()
            }

-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|

-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                println#(version#)
            }

        }

-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
        }

-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                    super<R|kotlin/Any|>()
                }

-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                }

            }

-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
        }
        )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
        }
        )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>

-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
@@ -3,24 +3,24 @@ FIR element: FirVariableAssignmentImpl
 FIR source kind: KtRealSourceElementKind

 FIR element rendered:
-builder#.version# = String()
+R|/builder|.<Unresolved name: version># = String()

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] assignmentStatement.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                super<R|kotlin/Any|>()
            }

-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|

-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                println#(version#)
            }

@@ -33,30 +33,30 @@ FILE: [ResolvedTo(IMPORTS)] assignmentStatement.kts

        }

-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
        }

-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                    super<R|kotlin/Any|>()
                }

-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                }

            }

-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
        }
        )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
        }
        )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>

-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
@@ -5,18 +5,18 @@ FIR source kind: KtRealSourceElementKind
 FIR element rendered:
 context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
 SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-    [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-    public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+    public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+        public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
            super<R|kotlin/Any|>()
        }

-        public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+        public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|

-        public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+        public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
            println#(version#)
        }

@@ -29,50 +29,50 @@ SCRIPT: [ResolvedTo(BODY_RESOLVE)]

    }

-    public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-        ^build Builder#().apply#(action#)
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+        ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
    }

-    build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-        version# = String(123)
-        local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+    R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+        this@R|special/anonymous|.R|/Builder.version| = String(123)
+        local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                super<R|kotlin/Any|>()
            }

-            public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+            public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
            }

        }

-        execute#()
+        this@R|special/anonymous|.R|/Builder.execute|()
    }
    )
-    public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-        version# = String(321)
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+        <Unresolved name: version># = String(321)
    }
    )
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>

-    builder#.execute#()
-    builder#.version# = String()
+    R|/builder|.<Unresolved name: execute>#()
+    R|/builder|.<Unresolved name: version># = String()

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] scriptInitializer.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                super<R|kotlin/Any|>()
            }

-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|

-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                println#(version#)
            }

@@ -85,30 +85,30 @@ FILE: [ResolvedTo(IMPORTS)] scriptInitializer.kts

        }

-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
        }

-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                    super<R|kotlin/Any|>()
                }

-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                }

            }

-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
        }
        )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
        }
        )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>

-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
@@ -5,18 +5,18 @@ FIR source kind: KtRealSourceElementKind
 FIR element rendered:
 context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
 SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-    [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-    public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-        public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+    public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+        public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
            super<R|kotlin/Any|>()
        }

-        public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+        public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+            public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|

-        public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+        public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
            println#(version#)
        }

@@ -29,50 +29,50 @@ SCRIPT: [ResolvedTo(BODY_RESOLVE)]

    }

-    public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-        ^build Builder#().apply#(action#)
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+        ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
    }

-    build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-        version# = String(123)
-        local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+    R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+        this@R|special/anonymous|.R|/Builder.version| = String(123)
+        local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                super<R|kotlin/Any|>()
            }

-            public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+            public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
            }

        }

-        execute#()
+        this@R|special/anonymous|.R|/Builder.execute|()
    }
    )
-    public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-        version# = String(321)
+    public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+        <Unresolved name: version># = String(321)
    }
    )
-        public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+        public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>

-    builder#.execute#()
-    builder#.version# = String()
+    R|/builder|.<Unresolved name: execute>#()
+    R|/builder|.<Unresolved name: version># = String()

 FIR FILE:
 FILE: [ResolvedTo(IMPORTS)] statement.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
-    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+    SCRIPT: [ResolvedTo(BODY_RESOLVE)]
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

-        public? open [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| {
-            public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] constructor(): R|Builder| {
+        public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| {
+            public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| {
                super<R|kotlin/Any|>()
            }

-            public? final? [ResolvedTo(RAW_FIR)] var version: String = String()
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] get(): String
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Builder] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit|
+            public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String()
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] get(): R|kotlin/String|
+                public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Builder] set([ResolvedTo(CONTRACTS)] value: R|kotlin/String|): R|kotlin/Unit|

-            public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| {
+            public final [ResolvedTo(CONTRACTS)] fun execute(): R|kotlin/Unit| {
                println#(version#)
            }

@@ -85,30 +85,30 @@ FILE: [ResolvedTo(IMPORTS)] statement.kts

        }

-        public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): <implicit> {
-            ^build Builder#().apply#(action#)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun build([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| {
+            ^build R|/Builder.Builder|().R|kotlin/apply|<R|Builder|>(R|<local>/action|)
        }

-        build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(123)
-            local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| {
-                public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| {
+        R|/build|(<L> = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=@ExtensionFunctionType kotlin/Function1<Builder, kotlin/Unit>] build@fun R|Builder|.<anonymous>(): R|kotlin/Unit| <inline=NoInline>  {
+            this@R|special/anonymous|.R|/Builder.version| = String(123)
+            local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
+                public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
                    super<R|kotlin/Any|>()
                }

-                public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| {
+                public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| {
                }

            }

-            execute#()
+            this@R|special/anonymous|.R|/Builder.execute|()
        }
        )
-        public? final? [ResolvedTo(RAW_FIR)] val builder: <implicit> = build#(<L> = [ResolvedTo(RAW_FIR)] build@fun <implicit>.<anonymous>(): <implicit> <inline=Unknown>  {
-            version# = String(321)
+        public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val builder: <ERROR TYPE REF: Unresolved name: build> = <Unresolved name: build>#(<L> = [ResolvedTo(RAW_FIR)] build@fun <anonymous>(): R|kotlin/Unit| <inline=Unknown>  {
+            <Unresolved name: version># = String(321)
        }
        )
-            public? [ResolvedTo(RAW_FIR)] get(): <implicit>
+            public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): <ERROR TYPE REF: Unresolved name: build>

-        builder#.execute#()
-        builder#.version# = String()
+        R|/builder|.<Unresolved name: execute>#()
+        R|/builder|.<Unresolved name: version># = String()
@@ -704,7 +704,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| {
@@ -184,7 +184,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.<Unresolved name: TYPE_USE>#)) public final [ResolvedTo(BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| {
@@ -444,7 +444,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class AnotherAnnotation : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| {
@@ -613,7 +613,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] enum class X : R|kotlin/Enum<X>| {
            private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|X| {
@@ -262,7 +262,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Number|> : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Number|>([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/Anno.value] value: <ERROR TYPE REF: Symbol not found for KClass>): R|one/Anno<T>| {
@@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationsScript.kts
    [ResolvedTo(BODY_RESOLVE)] annotations container
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        @R|kotlin/Suppress|[Types](names = vararg(String(2))) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
        }
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameter2Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterOnImplicitTypePhaseScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] anonymousFunctionWithAnnotatedParameterScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.message] message: R|kotlin/String|): R|Anno| {
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] classMembersScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
@@ -353,7 +353,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] annotationWithTargetScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|)) @R|Anno|[Types](s = String(string)) public final [ResolvedTo(BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| {
@@ -184,7 +184,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] classWithTypeParametersScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class ResolveMe<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K> : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K>(): R|ResolveMe<T, K>| {
@@ -262,7 +262,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionInValueClassScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        @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| {
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -483,7 +483,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -457,7 +457,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public open [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
@@ -392,7 +392,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverridesScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface OV : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] val originalExpressions: R|A|
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
            public abstract override [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -314,7 +314,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClassScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
            @R|kotlin/Deprecated|[Types](message = String(), replaceWith = R|kotlin/ReplaceWith.ReplaceWith|(expression = String(abc)), level = Q|kotlin/DeprecationLevel|.R|kotlin/DeprecationLevel.ERROR|) local final [ResolvedTo(BODY_RESOLVE)] class LocalClass : R|kotlin/Any| {
@@ -353,7 +353,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
@@ -353,7 +353,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
@@ -262,7 +262,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnFunctionScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyDelegateScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnPropertyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| {
@@ -444,7 +444,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface NonLocalInterface : R|kotlin/Any| {
        }
@@ -1718,7 +1718,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public sealed [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| {
            protected [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| {
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface ResolveMe : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /ResolveMe -> /E> {
        }
@@ -405,7 +405,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
        }
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicHierarchyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface B : <ERROR TYPE REF: Symbol not found for A>, <ERROR TYPE REF: Loop in supertype: /B -> /ResolveMe> {
        }
@@ -366,7 +366,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public open [ResolvedTo(BODY_RESOLVE)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| {
@@ -366,7 +366,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public open [ResolvedTo(BODY_RESOLVE)] class C : <ERROR TYPE REF: Loop in supertype: /C -> /D> {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| {
@@ -340,7 +340,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final data [ResolvedTo(BODY_RESOLVE)] class DataClass : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=DataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
@@ -340,7 +340,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final data [ResolvedTo(BODY_RESOLVE)] class DataClass : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=DataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| {
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitTypeScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Aaa] constructor([ResolvedTo(BODY_RESOLVE)] i: R|Interface|): R|Aaa| {
@@ -405,7 +405,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class Boo : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Boo] constructor(): R|one/Boo| {
@@ -769,7 +769,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] delegatesScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| {
            <Unresolved name: receive>#(<Unresolved name: valueWithExplicitType>#)
@@ -314,7 +314,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumEntriesScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
            private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
@@ -483,7 +483,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor(): R|Anno| {
@@ -314,7 +314,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumValueOfScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
            private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
@@ -314,7 +314,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] enumValuesScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] enum class MyEnum : R|kotlin/Enum<one/MyEnum>| {
            private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| {
@@ -756,7 +756,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] fakeOverrideScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun expression([ResolvedTo(BODY_RESOLVE)] expression: R|IrConst<*>|): R|kotlin/Unit| {
            when ([ResolvedTo(BODY_RESOLVE)] lval kind: R|Kind<out kotlin/Any?>| = R|<local>/expression|.R|SubstitutionOverride</IrConst.kind: R|Kind<CapturedType(*)>|>|) {
@@ -223,7 +223,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class Problem : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| {
@@ -265,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] fileAnnotationsScript.kts
    [ResolvedTo(BODY_RESOLVE)] annotations container
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FILE|)) public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
@@ -691,7 +691,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuterScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public open [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
@@ -184,7 +184,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionWithParameterScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface I : R|kotlin/Any| {
        }
@@ -319,7 +319,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] contractScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final inline [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
            [R|Contract description]
@@ -302,7 +302,7 @@ BODY_RESOLVE:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public? final? inline [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] block: ( () -> Unit )): R|kotlin/Unit|
            [Contract description] <
@@ -327,7 +327,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] contractScript2.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final inline [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit|
            [R|Contract description]
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResultScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public open [ResolvedTo(BODY_RESOLVE)] class Foo<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] constructor<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
@@ -145,7 +145,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionParameterScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] param: R|kotlin/Int|): R|kotlin/String| {
            ^foo String(boo)
@@ -379,7 +379,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInsideScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public open [ResolvedTo(BODY_RESOLVE)] class Foo<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] constructor<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
@@ -132,7 +132,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] functionWithTypeParametersScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K> resolveMe(): R|kotlin/Unit| {
        }
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -1055,7 +1055,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClassScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -483,7 +483,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : R|kotlin/Any| {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2Script.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
            public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -288,7 +288,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverrideScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : <ERROR TYPE REF: Loop in supertype: /Foo1 -> /Foo2> {
            public abstract override [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit|
@@ -379,7 +379,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterfaceScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class Arg : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| {
@@ -626,7 +626,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] class LazyDelegate<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(BODY_RESOLVE)] T>([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate<T>| {
@@ -535,7 +535,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localConstructorScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] T> magic(): R|T| {
            ^magic Null(null)!!
@@ -340,7 +340,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCallScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| {
@@ -340,7 +340,7 @@ FILE RAW TO BODY:
 FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteralScript.kts
    context(<script>@R|kotlin/script/templates/standard/ScriptTemplateWithArgs|)
    SCRIPT: [ResolvedTo(BODY_RESOLVE)] 
-        [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
+        [ResolvedTo(BODY_RESOLVE)] lval args: R|kotlin/Array<kotlin/String>|

        public open [ResolvedTo(BODY_RESOLVE)] class ClassWithParameter : R|kotlin/Any| {
            public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(BODY_RESOLVE)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| {
--- a/Show More
+++ b/Show More