From 95e04c97cce1f1722fe8e9258aacbd5a282e0227 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Sat, 29 Jul 2023 00:54:17 +0200 Subject: [PATCH] [LL FIR] LLFirWholeFileResolveTarget should process script declarations ^KT-60728 --- .../targets/LLFirWholeFileResolveTarget.kt | 8 +- .../fir/transformers/LLFirTargetResolver.kt | 9 +- .../level/api/fir/util/declarationUtils.kt | 9 +- ...classMemberPropertyScript.lazy.resolve.txt | 24 ++--- .../classScript.lazy.resolve.txt | 10 +- .../constructorsScript.lazy.resolve.txt | 12 +-- ...nnotationClassLevelScript.lazy.resolve.txt | 30 +++--- ...tionsInPropertyInitScript.lazy.resolve.txt | 18 ++-- .../enumClassScript.lazy.resolve.txt | 28 +++--- .../enumClassWithBodyScript.lazy.resolve.txt | 30 +++--- .../initBlockScript.lazy.resolve.txt | 10 +- .../localClassScript.lazy.resolve.txt | 16 +-- .../localFunScript.lazy.resolve.txt | 12 +-- .../localPropertyScript.lazy.resolve.txt | 24 ++--- .../memberTypeAliasScript.lazy.resolve.txt | 6 +- .../nestedClassesScript.lazy.resolve.txt | 22 ++--- .../propertyAccessorsScript.lazy.resolve.txt | 24 ++--- .../fileStructure/script.lazy.resolve.txt | 28 +++--- .../superClassCallScript.lazy.resolve.txt | 54 +++++----- ...sionBodyFunWithTypeScript.lazy.resolve.txt | 4 +- ...nBodyFunWithoutTypeScript.lazy.resolve.txt | 4 +- ...topLevelFunWithTypeScript.lazy.resolve.txt | 6 +- .../topLevelPropertyScript.lazy.resolve.txt | 20 ++-- .../topLevelUnitFunScript.lazy.resolve.txt | 4 +- .../withoutNameScript.lazy.resolve.txt | 34 +++---- .../annotationArgumentsMixScript.txt | 42 ++++---- .../annotationClassWithJavaTargetScript.txt | 4 +- .../annotationOnLocalClassScript.txt | 18 ++-- .../annotationParametersScript.txt | 30 +++--- .../annotationWithTypeArgumentScript.txt | 39 ++++---- .../lazyResolve/annotationsScript.txt | 2 +- ...sFunctionWithAnnotatedParameter2Script.txt | 20 ++-- ...atedParameterOnImplicitTypePhaseScript.txt | 20 ++-- ...usFunctionWithAnnotatedParameterScript.txt | 20 ++-- .../lazyResolve/classMembersScript.txt | 18 ++-- .../classes/annotationWithTargetScript.txt | 16 +-- .../classes/classWithTypeParametersScript.txt | 4 +- .../classes/functionInValueClassScript.txt | 10 +- ...archyWithOverrideAndNestedClass2Script.txt | 62 ++++++------ ...archyWithOverrideAndNestedClass3Script.txt | 62 ++++++------ ...archyWithOverrideAndNestedClass4Script.txt | 62 ++++++------ ...rarchyWithOverrideAndNestedClassScript.txt | 62 ++++++------ .../classes/hierarchyWithOverrideScript.txt | 28 +++--- .../lazyResolve/classes/nestedClassScript.txt | 20 ++-- ...stedClassWithPropertiesOverridesScript.txt | 20 ++-- .../classes/simpleLoopInOverride2Script.txt | 41 ++++---- .../classes/simpleLoopInOverrideScript.txt | 41 ++++---- ...erRequiredAnnotationOnLocalClassScript.txt | 10 +- ...AnnotationsOnConstructorPropertyScript.txt | 16 +-- ...RequiredAnnotationsOnConstructorScript.txt | 16 +-- ...lerRequiredAnnotationsOnFunctionScript.txt | 10 +- ...redAnnotationsOnPropertyDelegateScript.txt | 16 +-- ...lerRequiredAnnotationsOnPropertyScript.txt | 18 ++-- .../complexLocalHierarchyScript.txt | 22 ++--- .../complexRedeclarationScript.txt | 98 +++++++++---------- .../lazyResolve/cyclicHierarchy2Script.txt | 41 ++++---- .../lazyResolve/cyclicHierarchy3Script.txt | 45 ++++----- .../lazyResolve/cyclicHierarchyScript.txt | 41 ++++---- .../cyclicNestedHierarchy2Script.txt | 45 ++++----- .../cyclicNestedHierarchyScript.txt | 45 ++++----- .../lazyResolve/dataClassCopyScript.txt | 18 ++-- .../lazyResolve/dataComponent2Script.txt | 18 ++-- .../delegateWithImplicitTypeScript.txt | 43 ++++---- .../lazyResolve/delegatedFieldScript.txt | 18 ++-- .../testdata/lazyResolve/delegatesScript.txt | 87 ++++++++-------- .../lazyResolve/enumEntriesScript.txt | 14 +-- .../testdata/lazyResolve/enumEntryScript.txt | 20 ++-- .../lazyResolve/enumValueOfScript.txt | 14 +-- .../testdata/lazyResolve/enumValuesScript.txt | 14 +-- .../lazyResolve/fakeOverrideScript.txt | 75 +++++++------- .../fakePrimaryConstructorScript.txt | 6 +- .../lazyResolve/fileAnnotationsScript.txt | 8 +- .../fromLocalHierarchyToOuterScript.txt | 34 +++---- .../functionWithParameterScript.txt | 6 +- .../lazyResolve/functions/contractScript.txt | 16 ++- .../lazyResolve/functions/contractScript2.txt | 16 ++- .../functionCallWithGenericResultScript.txt | 10 +- .../functions/functionParameterScript.txt | 2 +- ...ionWithGenericExpectedTypeInsideScript.txt | 18 ++-- .../functionWithTypeParametersScript.txt | 2 +- ...archyWithOverrideAndNestedClass2Script.txt | 62 ++++++------ ...archyWithOverrideAndNestedClass3Script.txt | 62 ++++++------ ...rarchyWithOverrideAndNestedClassScript.txt | 62 ++++++------ .../functions/hierarchyWithOverrideScript.txt | 28 +++--- .../functions/simpleLoopInOverride2Script.txt | 41 ++++---- .../functions/simpleLoopInOverrideScript.txt | 41 ++++---- .../lambdaAsSAMInterfaceScript.txt | 16 +-- .../lazyResolve/lazyPropertyScript.txt | 32 +++--- .../lazyResolve/localConstructorScript.txt | 28 +++--- ...ocalFunctionInsideAnnotationCallScript.txt | 14 +-- ...calFunctionInsideFunctionLiteralScript.txt | 12 +-- ...deLambdaCallInsideStringTemplateScript.txt | 18 ++-- .../localFunctionInsideStatement.txt | 18 ++-- ...ocalFunctionInsideStringTemplateScript.txt | 12 +-- ...ocalFunctionInsideSuperEntryCallScript.txt | 18 ++-- .../lazyResolve/localNestedClassScript.txt | 30 +++--- ...calParameterInsideSuperEntryCallScript.txt | 18 ++-- ...ilerRequiredAnnotationsForMemberScript.txt | 81 +++++++-------- ...lerRequiredAnnotationsInsideBodyScript.txt | 32 +++--- ...estedCompilerRequiredAnnotationsScript.txt | 81 +++++++-------- .../lazyResolve/nestedTypeAlias2Script.txt | 12 +-- .../lazyResolve/nestedTypeAliasScript.txt | 51 +++++----- .../parameterOfNonLocalSetterScript.txt | 12 +-- .../parameterOfTopSetterScript.txt | 8 +- .../primaryConstructorParameterScript.txt | 6 +- .../primaryConstructorPropertyScript.txt | 10 +- .../lazyResolve/primaryConstructorScript.txt | 6 +- .../properties/getterWithDelegationScript.txt | 43 ++++---- ...archyWithOverrideAndNestedClass2Script.txt | 66 ++++++------- ...archyWithOverrideAndNestedClass3Script.txt | 66 ++++++------- ...archyWithOverrideAndNestedClass4Script.txt | 70 ++++++------- ...rarchyWithOverrideAndNestedClassScript.txt | 66 ++++++------- .../hierarchyWithOverrideScript.txt | 32 +++--- ...rtyGetterWithExplicitTypeAndBodyScript.txt | 6 +- .../propertyGetterWithExplicitTypeScript.txt | 6 +- .../propertyGetterWithImplicitTypeScript.txt | 6 +- .../properties/propertySetterScript.txt | 6 +- .../propertyWithTypeParametersScript.txt | 6 +- .../simpleLoopInOverride2Script.txt | 53 +++++----- .../properties/simpleLoopInOverrideScript.txt | 53 +++++----- .../propertyWithGetterAndSetterScript.txt | 18 ++-- .../lazyResolve/propertyWithGetterScript.txt | 12 +-- .../propertyWithInitializerScript.txt | 8 +- .../lazyResolve/redeclarationScript.txt | 8 +- .../resolveSuperTypeFromLocalClassScript.txt | 16 +-- ...lveTypeFromLocalClassConstructorScript.txt | 22 ++--- .../resolveTypeFromLocalFunctionScript.txt | 20 ++-- .../testdata/lazyResolve/script.txt | 46 ++++----- .../testdata/lazyResolve/script2.txt | 42 ++++---- .../secondaryConstructorParameterScript.txt | 18 ++-- .../secondaryConstructorScript.txt | 12 +-- .../testdata/lazyResolve/statement.txt | 24 ++--- .../testdata/lazyResolve/statement2.txt | 24 ++--- .../substitutionFakeOverrideScript.txt | 43 ++++---- ...tionFakeOverrideWithImplicitTypeScript.txt | 45 ++++----- .../lazyResolve/superTypesLoopScript.txt | 53 +++++----- .../testdata/lazyResolve/superTypesScript.txt | 16 +-- .../lazyResolve/topLevelFunctionsScript.txt | 8 +- ...ithExpressionBodyAndExplicitTypeScript.txt | 8 +- ...opLevelFunctionsWithImplicitTypeScript.txt | 37 +++---- .../typeAliasWithTypeParametersScript.txt | 2 +- .../lazyResolve/typeParameterBoundsScript.txt | 10 +- .../typeParameterOfClass2Script.txt | 8 +- .../typeParameterOfClassScript.txt | 6 +- .../typeParameterOfNonLocalFunctionScript.txt | 6 +- .../typeParameterOfTopFunctionScript.txt | 2 +- .../typeParameterOfTopSetterScript.txt | 6 +- .../typeParameterOfTypeAliasScript.txt | 6 +- 148 files changed, 1900 insertions(+), 1865 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirWholeFileResolveTarget.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirWholeFileResolveTarget.kt index 2d36fe25720..a83777e3aa8 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirWholeFileResolveTarget.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/targets/LLFirWholeFileResolveTarget.kt @@ -5,9 +5,11 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets +import org.jetbrains.kotlin.analysis.low.level.api.fir.util.forEachDeclaration import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirRegularClass +import org.jetbrains.kotlin.fir.declarations.FirScript /** * [LLFirResolveTarget] representing all declarations in file. All of them are going to be resolved. @@ -20,10 +22,12 @@ class LLFirWholeFileResolveTarget( override fun forEachTarget(action: (FirElementWithResolveState) -> Unit) { fun goInside(target: FirElementWithResolveState) { action(target) - if (target is FirRegularClass) { - target.declarations.forEach(::goInside) + when (target) { + is FirRegularClass -> target.declarations.forEach(::goInside) + is FirScript -> target.forEachDeclaration(::goInside) } } + forEachTopLevelDeclaration(::goInside) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt index 10abb7489b1..ec6ba56d098 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt @@ -8,10 +8,13 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.transformers import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.* import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkPhase +import org.jetbrains.kotlin.analysis.low.level.api.fir.util.forEachDeclaration import org.jetbrains.kotlin.fir.FirElementWithResolveState +import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirResolvePhase +import org.jetbrains.kotlin.fir.declarations.FirScript internal abstract class LLFirTargetResolver( protected val resolveTarget: LLFirResolveTarget, @@ -91,12 +94,14 @@ internal abstract class LLFirTargetResolver( private fun resolveTargetWithNestedDeclarations(target: FirElementWithResolveState) { performResolve(target) - if (target is FirRegularClass) { - withRegularClass(target) { + when (target) { + is FirRegularClass -> withRegularClass(target) { for (member in target.declarations) { resolveTargetWithNestedDeclarations(member) } } + + is FirScript -> target.forEachDeclaration(::resolveTargetWithNestedDeclarations) } } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt index 90ff2a21788..d8d929c38c8 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/declarationUtils.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirFileBui import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.LLFirProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.llFirSession import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.realPsi import org.jetbrains.kotlin.fir.resolve.providers.FirProvider @@ -190,6 +191,12 @@ private fun KtClassLikeDeclaration.findFir(provider: FirProvider): FirClassLikeD } } - val FirDeclaration.isGeneratedDeclaration get() = realPsi == null + +internal inline fun FirScript.forEachDeclaration(action: (FirDeclaration) -> Unit) { + for (statement in statements) { + if (statement !is FirDeclaration || statement.origin is FirDeclarationOrigin.ScriptCustomization) continue + action(statement) + } +} diff --git a/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt index 456ed439829..4f1af517f37 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/classMemberPropertyScript.lazy.resolve.txt @@ -3,25 +3,25 @@ FILE: [ResolvedTo(IMPORTS)] classMemberPropertyScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|X| { + public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| { super() } - public? final? [ResolvedTo(RAW_FIR)] var x: Int - public? [ResolvedTo(RAW_FIR)] get(): Int { - ^ field# + public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { + ^ this@R|/X|.F|/X.x| } - public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { - field# = value# + public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { + this@R|/X|.F|/X.x| = R|/value| } - public? final? [ResolvedTo(RAW_FIR)] val y: = IntegerLiteral(42) - public? [ResolvedTo(RAW_FIR)] get(): + public final [ResolvedTo(BODY_RESOLVE)] val y: R|kotlin/Int| = Int(42) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public? final? [ResolvedTo(RAW_FIR)] var z: Int = IntegerLiteral(15) - public? [ResolvedTo(RAW_FIR)] get(): Int - public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| + public final [ResolvedTo(BODY_RESOLVE)] var z: R|kotlin/Int| = Int(15) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| + public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt index 481efdbcd9a..1b35c68fcb1 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/classScript.lazy.resolve.txt @@ -3,16 +3,16 @@ FILE: [ResolvedTo(IMPORTS)] classScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super() } - public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| { + public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { } - public? final? [ResolvedTo(RAW_FIR)] fun y(): Int { - ^y IntegerLiteral(10) + public final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/Int| { + ^y Int(10) } } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt index edc2cbe4f46..71f2d5eb25b 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/constructorsScript.lazy.resolve.txt @@ -3,16 +3,16 @@ FILE: [ResolvedTo(IMPORTS)] constructorsScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor([ResolvedTo(RAW_FIR)] a: Int): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Int|): R|A| { super() } - public? final? [ResolvedTo(RAW_FIR)] val a: Int = R|/a| - public? [ResolvedTo(RAW_FIR)] get(): Int + public final [ResolvedTo(BODY_RESOLVE)] val a: R|kotlin/Int| = R|/a| + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { - this(IntegerLiteral(1)) + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { + this(Int(1)) } } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt index ea6b3de4545..9bbc695349e 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt @@ -3,42 +3,42 @@ FILE: [ResolvedTo(IMPORTS)] danglingAnnotationClassLevelScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class Foo : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Foo| { + public final [ResolvedTo(BODY_RESOLVE)] class Foo : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Foo| { super() } - @Suppress[Unresolved](String()) @MustBeDocumented[Unresolved]() + @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } - public? final? [ResolvedTo(RAW_FIR)] class Bar : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Bar| { + public final [ResolvedTo(BODY_RESOLVE)] class Bar : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Bar| { super() } - @Suppress[Unresolved](String()) @MustBeDocumented[Unresolved]() + @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } - public? final? [ResolvedTo(RAW_FIR)] class Outer : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Outer| { + public final [ResolvedTo(BODY_RESOLVE)] class Outer : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Outer| { super() } - public? final? [ResolvedTo(RAW_FIR)] class Inner : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Outer.Inner| { + public final [ResolvedTo(BODY_RESOLVE)] class Inner : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Outer.Inner| { super() } - @Suppress[Unresolved](String()) @MustBeDocumented[Unresolved]() + @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } - public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - local final? [ResolvedTo(RAW_FIR)] class Local : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Outer.Local| { + public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { + local final [ResolvedTo(BODY_RESOLVE)] class Local : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Outer.Local| { super() } - @Suppress[Unresolved](String()) @MustBeDocumented[Unresolved]() + @R|kotlin/Suppress|[Types](names = vararg(String())) @R|kotlin/annotation/MustBeDocumented|[Types]() } } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt index 297d2d6e0e9..222e65bae61 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt @@ -3,27 +3,27 @@ FILE: [ResolvedTo(IMPORTS)] declarationsInPropertyInitScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super() } - public? final? [ResolvedTo(RAW_FIR)] val a: = run#( = [ResolvedTo(RAW_FIR)] run@fun .(): { - local final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A.X| { + public final [ResolvedTo(BODY_RESOLVE)] val a: R|kotlin/Unit| = this@R|/A|.R|kotlin/run|( = [ResolvedTo(BODY_RESOLVE)] run@fun R|A|.(): R|kotlin/Unit| { + local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A.X| { super() } } - [ResolvedTo(RAW_FIR)] lval y: = IntegerLiteral(10) + [ResolvedTo(BODY_RESOLVE)] lval y: R|kotlin/Int| = Int(10) } ) - public? [ResolvedTo(RAW_FIR)] get(): + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Unit| } - public? final? inline [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] R> run([ResolvedTo(RAW_FIR)] block: ( () -> R )): R { - ^run block#() + public final inline [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] R> run([ResolvedTo(BODY_RESOLVE)] block: R|() -> R|): R|R| { + ^run R|/block|.R|SubstitutionOverride|() } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt index 57e4214baee..481d50e4c5d 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/enumClassScript.lazy.resolve.txt @@ -3,32 +3,32 @@ FILE: [ResolvedTo(IMPORTS)] enumClassScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] enum class A : R|kotlin/Enum| { - private [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] enum class A : R|kotlin/Enum| { + private [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super|>() } - public final static [ResolvedTo(RAW_FIR)] enum entry X: R|A| - public final static [ResolvedTo(RAW_FIR)] enum entry Y: R|A| - public final static [ResolvedTo(RAW_FIR)] enum entry Z: R|A| - public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { + public final static [ResolvedTo(BODY_RESOLVE)] enum entry X: R|A| + public final static [ResolvedTo(BODY_RESOLVE)] enum entry Y: R|A| + public final static [ResolvedTo(BODY_RESOLVE)] enum entry Z: R|A| + public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } - public? final? [ResolvedTo(RAW_FIR)] val x: = IntegerLiteral(10) - public? [ResolvedTo(RAW_FIR)] get(): + public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| = Int(10) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public? final? [ResolvedTo(RAW_FIR)] fun bar(): { - ^bar IntegerLiteral(10) + public final [ResolvedTo(BODY_RESOLVE)] fun bar(): R|kotlin/Int| { + ^bar Int(10) } - public final static [ResolvedTo(RAW_FIR)] fun values(): R|kotlin/Array| { + public final static [ResolvedTo(BODY_RESOLVE)] fun values(): R|kotlin/Array| { } - public final static [ResolvedTo(RAW_FIR)] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|A| { + public final static [ResolvedTo(BODY_RESOLVE)] fun valueOf([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|A| { } - public final static [ResolvedTo(RAW_FIR)] val entries: R|kotlin/enums/EnumEntries| - public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries| + public final static [ResolvedTo(BODY_RESOLVE)] val entries: R|kotlin/enums/EnumEntries| + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/enums/EnumEntries| } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt index e807667c688..91cc0d2dd44 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/enumClassWithBodyScript.lazy.resolve.txt @@ -3,44 +3,44 @@ FILE: [ResolvedTo(IMPORTS)] enumClassWithBodyScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] enum class A : R|kotlin/Enum| { - private [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] enum class A : R|kotlin/Enum| { + private [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super|>() } - public final static [ResolvedTo(RAW_FIR)] enum entry X: R|A| = object : R|A| { - private [ResolvedTo(RAW_FIR)] constructor(): R|| { + public final static [ResolvedTo(BODY_RESOLVE)] enum entry X: R|A| = object : R|A| { + private [ResolvedTo(BODY_RESOLVE)] constructor(): R|| { super() } - public? final? [ResolvedTo(RAW_FIR)] fun localInX(): { - ^localInX IntegerLiteral(1) + public final [ResolvedTo(BODY_RESOLVE)] fun localInX(): R|kotlin/Int| { + ^localInX Int(1) } } - public final static [ResolvedTo(RAW_FIR)] enum entry Y: R|A| = object : R|A| { - private [ResolvedTo(RAW_FIR)] constructor(): R|| { + public final static [ResolvedTo(BODY_RESOLVE)] enum entry Y: R|A| = object : R|A| { + private [ResolvedTo(BODY_RESOLVE)] constructor(): R|| { super() } - public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { + public open override [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } } - public final static [ResolvedTo(RAW_FIR)] enum entry Z: R|A| - public? open [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { + public final static [ResolvedTo(BODY_RESOLVE)] enum entry Z: R|A| + public open [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } - public final static [ResolvedTo(RAW_FIR)] fun values(): R|kotlin/Array| { + public final static [ResolvedTo(BODY_RESOLVE)] fun values(): R|kotlin/Array| { } - public final static [ResolvedTo(RAW_FIR)] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|A| { + public final static [ResolvedTo(BODY_RESOLVE)] fun valueOf([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|A| { } - public final static [ResolvedTo(RAW_FIR)] val entries: R|kotlin/enums/EnumEntries| - public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries| + public final static [ResolvedTo(BODY_RESOLVE)] val entries: R|kotlin/enums/EnumEntries| + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/enums/EnumEntries| } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt index 7d592c74ec9..24e4492a504 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt @@ -3,15 +3,15 @@ FILE: [ResolvedTo(IMPORTS)] initBlockScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super() } init { - [ResolvedTo(RAW_FIR)] lval x: = IntegerLiteral(10) - local final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A.B| { + [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = Int(10) + local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { + public [ResolvedTo(RAW_FIR)] constructor(): R|A.B| { super() } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt index 1830e3e881e..ed5c098dc88 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt @@ -3,9 +3,9 @@ FILE: [ResolvedTo(IMPORTS)] localClassScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] fun a(): R|kotlin/Unit| { - local final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|X| { + public final [ResolvedTo(BODY_RESOLVE)] fun a(): R|kotlin/Unit| { + local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| { super() } @@ -13,14 +13,14 @@ FILE: [ResolvedTo(IMPORTS)] localClassScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class Y : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Y| { + public final [ResolvedTo(BODY_RESOLVE)] class Y : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Y| { super() } - public? final? [ResolvedTo(RAW_FIR)] fun b(): R|kotlin/Unit| { - local final? [ResolvedTo(RAW_FIR)] class Z : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Y.Z| { + public final [ResolvedTo(BODY_RESOLVE)] fun b(): R|kotlin/Unit| { + local final [ResolvedTo(BODY_RESOLVE)] class Z : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Y.Z| { super() } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt index d7ee81cdc91..0cb97de68fc 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/localFunScript.lazy.resolve.txt @@ -3,19 +3,19 @@ FILE: [ResolvedTo(IMPORTS)] localFunScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| { - local final? [ResolvedTo(RAW_FIR)] fun y(): R|kotlin/Unit| { + public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { + local final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/Unit| { } } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super() } - public? final? [ResolvedTo(RAW_FIR)] fun z(): R|kotlin/Unit| { - local final? [ResolvedTo(RAW_FIR)] fun q(): R|kotlin/Unit| { + public final [ResolvedTo(BODY_RESOLVE)] fun z(): R|kotlin/Unit| { + local final [ResolvedTo(BODY_RESOLVE)] fun q(): R|kotlin/Unit| { } } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt index 32cde986c29..4398767a7dc 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/localPropertyScript.lazy.resolve.txt @@ -3,33 +3,33 @@ FILE: [ResolvedTo(IMPORTS)] localPropertyScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - [ResolvedTo(RAW_FIR)] lvar x: Int + public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { + [ResolvedTo(BODY_RESOLVE)] lvar x: R|kotlin/Int| } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super() } - public? final? [ResolvedTo(RAW_FIR)] fun q(): R|kotlin/Unit| { - [ResolvedTo(RAW_FIR)] lval y: = IntegerLiteral(42) + public final [ResolvedTo(BODY_RESOLVE)] fun q(): R|kotlin/Unit| { + [ResolvedTo(BODY_RESOLVE)] lval y: R|kotlin/Int| = Int(42) } } - public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|B| { + public final [ResolvedTo(BODY_RESOLVE)] class B : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|B| { super() } - public? final? [ResolvedTo(RAW_FIR)] class C : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|B.C| { + public final [ResolvedTo(BODY_RESOLVE)] class C : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|B.C| { super() } - public? final? [ResolvedTo(RAW_FIR)] fun u(): R|kotlin/Unit| { - [ResolvedTo(RAW_FIR)] lvar z: Int = IntegerLiteral(15) + public final [ResolvedTo(BODY_RESOLVE)] fun u(): R|kotlin/Unit| { + [ResolvedTo(BODY_RESOLVE)] lvar z: R|kotlin/Int| = Int(15) } } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt index 5ef88007854..2b9e841af46 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/memberTypeAliasScript.lazy.resolve.txt @@ -3,12 +3,12 @@ FILE: [ResolvedTo(IMPORTS)] memberTypeAliasScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super() } - public? final [ResolvedTo(RAW_FIR)] typealias X = Int + public final [ResolvedTo(BODY_RESOLVE)] typealias X = R|kotlin/Int| } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt index 3aa3647057b..1678601263b 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/nestedClassesScript.lazy.resolve.txt @@ -3,21 +3,21 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassesScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super() } - public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A.B| { + public final [ResolvedTo(BODY_RESOLVE)] class B : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A.B| { super() } - public? final? [ResolvedTo(RAW_FIR)] fun x(): R|kotlin/Unit| { + public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { } - public? final? [ResolvedTo(RAW_FIR)] class C : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A.B.C| { + public final [ResolvedTo(BODY_RESOLVE)] class C : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A.B.C| { super() } @@ -25,15 +25,15 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassesScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class E : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A.E| { + public final [ResolvedTo(BODY_RESOLVE)] class E : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A.E| { super() } } - public? final? [ResolvedTo(RAW_FIR)] fun y(): Int { - ^y IntegerLiteral(10) + public final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/Int| { + ^y Int(10) } } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt index e15dbcaefc2..aabeed1a565 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/propertyAccessorsScript.lazy.resolve.txt @@ -3,25 +3,25 @@ FILE: [ResolvedTo(IMPORTS)] propertyAccessorsScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] var x: Int = IntegerLiteral(10) - public? [ResolvedTo(RAW_FIR)] get(): Int { - ^ field# + public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(10) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { + ^ F|/x| } - public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { - field# = value# + public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { + F|/x| = R|/value| } - public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|X| { + public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| { super() } - public? final? [ResolvedTo(RAW_FIR)] var y: Int = IntegerLiteral(10) - public? [ResolvedTo(RAW_FIR)] get(): Int { - ^ field# + public final [ResolvedTo(BODY_RESOLVE)] var y: R|kotlin/Int| = Int(10) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { + ^ this@R|/X|.F|/X.y| } - public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { - field# = value# + public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { + this@R|/X|.F|/X.y| = R|/value| } } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt index 6658a9ebac7..75b53b0ae37 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt @@ -3,27 +3,27 @@ FILE: [ResolvedTo(IMPORTS)] script.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class Builder : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Builder| { + public final [ResolvedTo(BODY_RESOLVE)] class Builder : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Builder| { super() } - public? final? [ResolvedTo(RAW_FIR)] var version: String = String() - public? [ResolvedTo(RAW_FIR)] get(): String - public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| + public final [ResolvedTo(BODY_RESOLVE)] var version: R|kotlin/String| = String() + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| + public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|kotlin/Unit| - public? final? [ResolvedTo(RAW_FIR)] fun execute(): R|kotlin/Unit| { - println#(version#) + public final [ResolvedTo(BODY_RESOLVE)] fun execute(): R|kotlin/Unit| { + #(this@R|/Builder|.R|/Builder.version|) } } - public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): { - ^build Builder#().apply#(action#) + public final [ResolvedTo(BODY_RESOLVE)] fun build([ResolvedTo(BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| { + ^build R|/Builder.Builder|().R|kotlin/apply|(R|/action|) } - public? final? [ResolvedTo(RAW_FIR)] fun build2([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): Builder { - ^build2 Builder#().apply#(action#) + public final [ResolvedTo(BODY_RESOLVE)] fun build2([ResolvedTo(BODY_RESOLVE)] action: R|Builder.() -> kotlin/Unit|): R|Builder| { + ^build2 R|/Builder.Builder|().R|kotlin/apply|(R|/action|) } build#( = [ResolvedTo(RAW_FIR)] build@fun .(): { @@ -41,11 +41,11 @@ FILE: [ResolvedTo(IMPORTS)] script.kts execute#() } ) - public? final? [ResolvedTo(RAW_FIR)] val builder: = build#( = [ResolvedTo(RAW_FIR)] build@fun .(): { - version# = String(321) + public final [ResolvedTo(BODY_RESOLVE)] val builder: = #( = [ResolvedTo(BODY_RESOLVE)] build@fun (): R|kotlin/Unit| { + # = String(321) } ) - public? [ResolvedTo(RAW_FIR)] get(): + public [ResolvedTo(BODY_RESOLVE)] get(): public final [ResolvedTo(RAW_FIR)] val $$result: = builder#.execute#() public [ResolvedTo(RAW_FIR)] get(): diff --git a/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt index 089ae736db1..c90de8b921f 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/superClassCallScript.lazy.resolve.txt @@ -3,28 +3,28 @@ FILE: [ResolvedTo(IMPORTS)] superClassCallScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor([ResolvedTo(RAW_FIR)] init: ( A.() -> Unit )): R|A| { + 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| { super() } - public? final? [ResolvedTo(RAW_FIR)] val prop: String = String() - public? [ResolvedTo(RAW_FIR)] get(): String + public final [ResolvedTo(BODY_RESOLVE)] val prop: R|kotlin/String| = String() + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| } - public? final? [ResolvedTo(RAW_FIR)] class B : A { - public? [ResolvedTo(RAW_FIR)] constructor(): R|B| { - super() + public final [ResolvedTo(BODY_RESOLVE)] class B : R|A| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|B| { + super() } } - public? final? [ResolvedTo(RAW_FIR)] object C : A { - private [ResolvedTo(RAW_FIR)] constructor(): R|C| { - super([ResolvedTo(RAW_FIR)] fun .(): { - local final? [ResolvedTo(RAW_FIR)] fun foo(): { - ^foo B#.prop#.toString#() + public final [ResolvedTo(BODY_RESOLVE)] object C : R|A| { + private [ResolvedTo(BODY_RESOLVE)] constructor(): R|C| { + super([ResolvedTo(RAW_FIR)] fun R|A|.(): R|kotlin/Unit| { + local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| { + ^foo Q|B|.#.R|kotlin/toString|() } } @@ -33,11 +33,11 @@ FILE: [ResolvedTo(IMPORTS)] superClassCallScript.kts } - public? final? [ResolvedTo(RAW_FIR)] val f: = object : A { - private [ResolvedTo(RAW_FIR)] constructor(): R|| { - super([ResolvedTo(RAW_FIR)] fun .(): { - local final? [ResolvedTo(RAW_FIR)] fun bar(): { - ^bar B#.prop#.toString#() + public final [ResolvedTo(BODY_RESOLVE)] val f: R|A| = object : R|A| { + private [ResolvedTo(BODY_RESOLVE)] constructor(): R|| { + super([ResolvedTo(BODY_RESOLVE)] fun R|A|.(): R|kotlin/Unit| { + local final [ResolvedTo(BODY_RESOLVE)] fun bar(): R|kotlin/String| { + ^bar Q|B|.#.R|kotlin/toString|() } } @@ -46,23 +46,23 @@ FILE: [ResolvedTo(IMPORTS)] superClassCallScript.kts } - public? [ResolvedTo(RAW_FIR)] get(): + public [ResolvedTo(BODY_RESOLVE)] get(): R|A| - public? final? [ResolvedTo(RAW_FIR)] class D : A { - public? [ResolvedTo(RAW_FIR)] error_constructor(): R|D| { - super([ResolvedTo(RAW_FIR)] fun .(): { - local final? [ResolvedTo(RAW_FIR)] fun foo(): { - ^foo B#.prop#.toString#() + public final [ResolvedTo(BODY_RESOLVE)] class D : R|A| { + public [ResolvedTo(BODY_RESOLVE)] error_constructor(): R|D| { + super([ResolvedTo(RAW_FIR)] fun R|A|.(): R|kotlin/Unit| { + local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| { + ^foo Q|B|.#.R|kotlin/toString|() } } ) } - public? [ResolvedTo(RAW_FIR)] constructor(): R|D| { - super([ResolvedTo(RAW_FIR)] fun .(): { - local final? [ResolvedTo(RAW_FIR)] fun boo(): { - ^boo prop#.toString#() + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|D| { + super([ResolvedTo(RAW_FIR)] fun R|A|.(): R|kotlin/Unit| { + local final [ResolvedTo(RAW_FIR)] fun boo(): R|kotlin/String| { + ^boo this@R|special/anonymous|.R|/A.prop|.R|kotlin/String.toString|() } } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt index e06355b73c6..633c684b4e4 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithTypeScript.lazy.resolve.txt @@ -3,7 +3,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelExpressionBodyFunWithTypeScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] fun foo(): Int { - ^foo IntegerLiteral(42) + public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| { + ^foo Int(42) } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt index d8df85e28cb..1bbb403dc3f 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelExpressionBodyFunWithoutTypeScript.lazy.resolve.txt @@ -3,7 +3,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelExpressionBodyFunWithoutTypeScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] fun foo(): { - ^foo IntegerLiteral(42) + public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| { + ^foo Int(42) } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt index 47b2e7ceb5b..a06231aaae5 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelFunWithTypeScript.lazy.resolve.txt @@ -3,8 +3,8 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunWithTypeScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] fun foo(): Int { - println#(String()) - ^foo IntegerLiteral(10) + public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| { + #(String()) + ^foo Int(10) } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt index 19a22b3fde0..7f528971df7 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelPropertyScript.lazy.resolve.txt @@ -3,18 +3,18 @@ FILE: [ResolvedTo(IMPORTS)] topLevelPropertyScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] var x: Int - public? [ResolvedTo(RAW_FIR)] get(): Int { - ^ field# + public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { + ^ F|/x| } - public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { - field# = value# + public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { + F|/x| = R|/value| } - public? final? [ResolvedTo(RAW_FIR)] val y: = IntegerLiteral(42) - public? [ResolvedTo(RAW_FIR)] get(): + public final [ResolvedTo(BODY_RESOLVE)] val y: R|kotlin/Int| = Int(42) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public? final? [ResolvedTo(RAW_FIR)] var z: Int = IntegerLiteral(15) - public? [ResolvedTo(RAW_FIR)] get(): Int - public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| + public final [ResolvedTo(BODY_RESOLVE)] var z: R|kotlin/Int| = Int(15) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| + public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt index cdea789ab67..a2f6b4e63a9 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/topLevelUnitFunScript.lazy.resolve.txt @@ -3,7 +3,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelUnitFunScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - println#(String()) + public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { + #(String()) } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt index dadc52b5770..c677760215a 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/withoutNameScript.lazy.resolve.txt @@ -3,43 +3,43 @@ FILE: [ResolvedTo(IMPORTS)] withoutNameScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] fun ([ResolvedTo(RAW_FIR)] a: Int = IntegerLiteral(1)): String { + public final [ResolvedTo(BODY_RESOLVE)] fun ([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Int| = Int(1)): R|kotlin/String| { ^ String(str) } - public? final? [ResolvedTo(RAW_FIR)] fun (): R|kotlin/Unit| { + public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Unit| { } - public? final? [ResolvedTo(RAW_FIR)] val : Int = IntegerLiteral(4) - public? [ResolvedTo(RAW_FIR)] get(): Int + public final [ResolvedTo(BODY_RESOLVE)] val : R|kotlin/Int| = Int(4) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public? final? [ResolvedTo(RAW_FIR)] var : Int - public? [ResolvedTo(RAW_FIR)] get(): Int { - ^ IntegerLiteral(4) + public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Int| + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { + ^ Int(4) } - public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { + public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { super() } - public? final? [ResolvedTo(RAW_FIR)] fun ([ResolvedTo(RAW_FIR)] a: Int = IntegerLiteral(1)): String { + public final [ResolvedTo(BODY_RESOLVE)] fun ([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Int| = Int(1)): R|kotlin/String| { ^ String(str) } - public? final? [ResolvedTo(RAW_FIR)] fun (): R|kotlin/Unit| { + public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Unit| { } - public? final? [ResolvedTo(RAW_FIR)] val : Int = IntegerLiteral(4) - public? [ResolvedTo(RAW_FIR)] get(): Int + public final [ResolvedTo(BODY_RESOLVE)] val : R|kotlin/Int| = Int(4) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public? final? [ResolvedTo(RAW_FIR)] var : Boolean - public? [ResolvedTo(RAW_FIR)] get(): Boolean { + public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Boolean| + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Boolean| { ^ Boolean(true) } - public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: Boolean): R|kotlin/Unit| { + public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Boolean|): R|kotlin/Unit| { } } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt index d54f75b7b76..21bbb59bc1c 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt @@ -706,50 +706,50 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { + public final [ResolvedTo(BODY_RESOLVE)] annotation class AnotherAnnotation : R|kotlin/Annotation| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { super() } } - public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { + public final [ResolvedTo(BODY_RESOLVE)] enum class EnumClass : R|kotlin/Enum| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { super|>() } - public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| - public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass| - public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array| { + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass| + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array| { } - public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| { + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|EnumClass| { } - public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries| - public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries| + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries| + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/enums/EnumEntries| } - public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { + public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| { super() } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|/str| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] get(): R|kotlin/String| - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|/ann| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val ann: R|AnotherAnnotation| = R|/ann| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] get(): R|AnotherAnnotation| - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|/c| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*> + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val c: R|kotlin/reflect/KClass<*>| = R|/c| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] get(): R|kotlin/reflect/KClass<*>| - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|/entry| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val entry: R|EnumClass| = R|/entry| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] get(): R|EnumClass| } - @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), (AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { + @R|kotlin/Deprecated|[Types](message = #()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = (Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt index e4d6b44ca7c..3ccccbf7aea 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt @@ -186,8 +186,8 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { + @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.#)) public final [ResolvedTo(BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { super() } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt index 34634692d7b..f41cef26f64 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt @@ -446,26 +446,26 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { + public final [ResolvedTo(BODY_RESOLVE)] annotation class AnotherAnnotation : R|kotlin/Annotation| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { super() } } - public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { + public final [ResolvedTo(BODY_RESOLVE)] annotation class KotlinAnnotation : R|kotlin/Annotation| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| { super() } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] get(): AnotherAnnotation + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|/s| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=KotlinAnnotation] get(): R|one/two/AnotherAnnotation| } - public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { + public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { + @R|one/two/KotlinAnnotation|[Types](s = R|one/two/AnotherAnnotation.AnotherAnnotation|()) local final [ResolvedTo(BODY_RESOLVE)] class LocalClass : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { super() } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt index 9f0db665638..665146451f1 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt @@ -615,42 +615,42 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts SCRIPT: [ResolvedTo(BODY_RESOLVE)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { + public final [ResolvedTo(BODY_RESOLVE)] enum class X : R|kotlin/Enum| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|X| { super|>() } - public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X| - public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun values(): R|kotlin/Array| { + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] enum entry A: R|X| + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] fun values(): R|kotlin/Array| { } - public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|X| { + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] fun valueOf([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|X| { } - public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries| - public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries| + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries| + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/enums/EnumEntries| } - public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { + public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Anno.args] args: ): R|Anno| { super() } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): A.X + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val args: = R|/args| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] get(): } - public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { + public final [ResolvedTo(BODY_RESOLVE)] class B : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=B] constructor(): R|B| { super() } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { + @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { + @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt index cb413a8c173..fa424c626f8 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt @@ -1,7 +1,7 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] annotationWithTypeArgumentScript.kts context(