From 33140b7fcf73fc4546a0bdb59dd07fc240432007 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 15 May 2023 19:50:16 +0200 Subject: [PATCH] [FIR] mark empty file annotation container as resolved To avoid redundant lazy resolve ^KT-56551 --- ...onClassWithJavaTarget.out_of_src_roots.txt | 26 +++++++++---------- .../annotationClassWithJavaTarget.txt | 26 +++++++++---------- .../annotationFromImplicitJavaType.txt | 26 +++++++++---------- ...FromImplicitJavaTypeWithJavaAnnotation.txt | 26 +++++++++---------- .../lazyResolve/annotationOnLocalClass.txt | 26 +++++++++---------- .../lazyResolve/annotationParameters.txt | 26 +++++++++---------- .../annotationWithTypeArgument.txt | 26 +++++++++---------- .../testdata/lazyResolve/classMembers.txt | 26 +++++++++---------- .../classes/annotationWithTarget.txt | 26 +++++++++---------- .../classes/classWithTypeParameters.txt | 26 +++++++++---------- .../classes/functionInValueClass.txt | 26 +++++++++---------- .../classes/hierarchyWithOverride.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass2.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass3.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass4.txt | 26 +++++++++---------- .../lazyResolve/classes/nestedClass.txt | 26 +++++++++---------- .../nestedClassWithPropertiesOverrides.txt | 26 +++++++++---------- .../classes/simpleLoopInOverride.txt | 26 +++++++++---------- .../classes/simpleLoopInOverride2.txt | 26 +++++++++---------- ...compilerRequiredAnnotationOnLocalClass.txt | 26 +++++++++---------- .../lazyResolve/complexLocalHierarchy.txt | 26 +++++++++---------- .../lazyResolve/complexRedeclaration.txt | 26 +++++++++---------- .../testdata/lazyResolve/cyclicHierarchy.txt | 26 +++++++++---------- .../testdata/lazyResolve/cyclicHierarchy2.txt | 26 +++++++++---------- .../testdata/lazyResolve/cyclicHierarchy3.txt | 26 +++++++++---------- .../lazyResolve/cyclicNestedHierarchy.txt | 26 +++++++++---------- .../lazyResolve/cyclicNestedHierarchy2.txt | 26 +++++++++---------- .../testdata/lazyResolve/dataClassCopy.txt | 26 +++++++++---------- .../testdata/lazyResolve/dataComponent2.txt | 26 +++++++++---------- .../testdata/lazyResolve/delegatedField.txt | 26 +++++++++---------- .../testdata/lazyResolve/delegates.txt | 26 +++++++++---------- .../testdata/lazyResolve/enumEntries.txt | 26 +++++++++---------- .../testdata/lazyResolve/enumEntry.txt | 26 +++++++++---------- .../testdata/lazyResolve/enumValueOf.txt | 26 +++++++++---------- .../testdata/lazyResolve/enumValues.txt | 26 +++++++++---------- .../annotationWithNamedFunctionArgument.txt | 26 +++++++++---------- .../anonymousObjectInInvalidPosition.txt | 26 +++++++++---------- .../testdata/lazyResolve/fakeOverride.txt | 26 +++++++++---------- .../lazyResolve/fakePrimaryConstructor.txt | 26 +++++++++---------- .../testdata/lazyResolve/fileAnnotations.txt | 4 +-- .../lazyResolve/fromLocalHierarchyToOuter.txt | 26 +++++++++---------- .../lazyResolve/functionWithParameter.txt | 26 +++++++++---------- .../functionCallWithGenericResult.txt | 26 +++++++++---------- .../functions/functionParameter.txt | 26 +++++++++---------- .../functionWithGenericExpectedTypeInside.txt | 26 +++++++++---------- .../functions/functionWithTypeParameters.txt | 26 +++++++++---------- .../functions/hierarchyWithOverride.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass2.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass3.txt | 26 +++++++++---------- .../functions/simpleLoopInOverride.txt | 26 +++++++++---------- .../functions/simpleLoopInOverride2.txt | 26 +++++++++---------- .../lazyResolve/lambdaAsSAMInterface.txt | 26 +++++++++---------- .../testdata/lazyResolve/lazyProperty.txt | 26 +++++++++---------- .../testdata/lazyResolve/localConstructor.txt | 26 +++++++++---------- .../localFunctionInsideAnnotationCall.txt | 26 +++++++++---------- .../localFunctionInsideFunctionLiteral.txt | 26 +++++++++---------- ...onInsideLambdaCallInsideStringTemplate.txt | 26 +++++++++---------- .../localFunctionInsideStringTemplate.txt | 26 +++++++++---------- .../localFunctionInsideSuperEntryCall.txt | 26 +++++++++---------- .../testdata/lazyResolve/localNestedClass.txt | 26 +++++++++---------- .../localParameterInsideSuperEntryCall.txt | 26 +++++++++---------- .../nestedCompilerRequiredAnnotations.txt | 26 +++++++++---------- ...edCompilerRequiredAnnotationsForMember.txt | 26 +++++++++---------- ...dCompilerRequiredAnnotationsInsideBody.txt | 26 +++++++++---------- .../testdata/lazyResolve/nestedTypeAlias.txt | 26 +++++++++---------- .../testdata/lazyResolve/nestedTypeAlias2.txt | 26 +++++++++---------- .../lazyResolve/parameterOfNonLocalSetter.txt | 26 +++++++++---------- .../lazyResolve/parameterOfTopSetter.txt | 26 +++++++++---------- .../lazyResolve/primaryConstructor.txt | 26 +++++++++---------- .../primaryConstructorParameter.txt | 26 +++++++++---------- .../primaryConstructorProperty.txt | 26 +++++++++---------- .../properties/hierarchyWithOverride.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass2.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass3.txt | 26 +++++++++---------- .../hierarchyWithOverrideAndNestedClass4.txt | 26 +++++++++---------- .../propertyGetterWithExplicitType.txt | 26 +++++++++---------- .../propertyGetterWithExplicitTypeAndBody.txt | 26 +++++++++---------- .../propertyGetterWithImplicitType.txt | 26 +++++++++---------- .../lazyResolve/properties/propertySetter.txt | 26 +++++++++---------- .../properties/propertyWithTypeParameters.txt | 26 +++++++++---------- .../properties/simpleLoopInOverride.txt | 26 +++++++++---------- .../properties/simpleLoopInOverride2.txt | 26 +++++++++---------- .../lazyResolve/propertyWithGetter.txt | 26 +++++++++---------- .../propertyWithGetterAndSetter.txt | 26 +++++++++---------- .../lazyResolve/propertyWithInitializer.txt | 26 +++++++++---------- .../testdata/lazyResolve/redeclaration.txt | 26 +++++++++---------- .../resolveSuperTypeFromLocalClass.txt | 26 +++++++++---------- .../resolveTypeFromLocalClassConstructor.txt | 26 +++++++++---------- .../resolveTypeFromLocalFunction.txt | 26 +++++++++---------- .../lazyResolve/secondaryConstructor.txt | 26 +++++++++---------- .../secondaryConstructorParameter.txt | 26 +++++++++---------- .../testdata/lazyResolve/superTypes.txt | 26 +++++++++---------- .../testdata/lazyResolve/superTypesLoop.txt | 26 +++++++++---------- .../lazyResolve/topLevelFunctions.txt | 26 +++++++++---------- ...tionsWithExpressionBodyAndExplicitType.txt | 26 +++++++++---------- .../topLevelFunctionsWithImplicitType.txt | 26 +++++++++---------- .../typeAliasWithTypeParameters.txt | 26 +++++++++---------- .../lazyResolve/typeParameterBounds.txt | 26 +++++++++---------- .../lazyResolve/typeParameterOfClass.txt | 26 +++++++++---------- .../typeParameterOfNonLocalFunction.txt | 26 +++++++++---------- .../typeParameterOfTopFunction.txt | 26 +++++++++---------- .../lazyResolve/typeParameterOfTopSetter.txt | 26 +++++++++---------- .../lazyResolve/typeParameterOfTypeAlias.txt | 26 +++++++++---------- .../converter/DeclarationsConverter.kt | 15 +++++++---- .../kotlin/fir/builder/RawFirBuilder.kt | 4 +++ 108 files changed, 1381 insertions(+), 1372 deletions(-) diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTarget.out_of_src_roots.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTarget.out_of_src_roots.txt index d9e9077d5bf..d7aa0c92785 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTarget.out_of_src_roots.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTarget.out_of_src_roots.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @java.lang.annotation.Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -10,7 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationClassWithJavaTarget.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @java.lang.annotation.Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -20,7 +20,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(COMPANION_GENERATION)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(SUPER_TYPES)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt TYPES: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](ElementType#.TYPE_USE#) public? final? [ResolvedTo(TYPES)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt STATUS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types]() 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/annotationClassWithJavaTarget.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTarget.txt index d2e3042b13c..1b1085e8cc4 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTarget.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTarget.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @java.lang.annotation.Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -10,7 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationClassWithJavaTarget.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @java.lang.annotation.Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -20,7 +20,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[CompilerRequiredAnnotations](ElementType#.TYPE_USE#) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[CompilerRequiredAnnotations](ElementType#.TYPE_USE#) public? final? [ResolvedTo(COMPANION_GENERATION)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[CompilerRequiredAnnotations](ElementType#.TYPE_USE#) public? final? [ResolvedTo(SUPER_TYPES)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt TYPES: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public? final? [ResolvedTo(TYPES)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt STATUS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.#)) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @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/annotationFromImplicitJavaType.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationFromImplicitJavaType.txt index fc6d4ee5fcc..4a758cd178a 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationFromImplicitJavaType.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationFromImplicitJavaType.txt @@ -1,72 +1,72 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] i: JavaInterface): { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] i: JavaInterface): { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] i: JavaInterface): { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe([ResolvedTo(COMPANION_GENERATION)] i: JavaInterface): { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe([ResolvedTo(SUPER_TYPES)] i: JavaInterface): { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe([ResolvedTo(TYPES)] i: R|JavaInterface|): { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe([ResolvedTo(STATUS)] i: R|JavaInterface|): { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe([ResolvedTo(EXPECT_ACTUAL_MATCHING)] i: R|JavaInterface|): { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] i: R|JavaInterface|): { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe([ResolvedTo(CONTRACTS)] i: R|JavaInterface|): { ^resolveMe i#.id# } IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] i: R|JavaInterface|): R|@R|KotlinAnnotation|() kotlin/Int| { ^resolveMe R|/i|.R|/JavaInterface.id| } ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] i: R|JavaInterface|): R|@R|KotlinAnnotation|() kotlin/Int| { ^resolveMe R|/i|.R|/JavaInterface.id| } BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe([ResolvedTo(BODY_RESOLVE)] i: R|JavaInterface|): R|@R|KotlinAnnotation|() kotlin/Int| { ^resolveMe R|/i|.R|/JavaInterface.id| } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationFromImplicitJavaTypeWithJavaAnnotation.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationFromImplicitJavaTypeWithJavaAnnotation.txt index 8708f0e0913..2cf392141c9 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationFromImplicitJavaTypeWithJavaAnnotation.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationFromImplicitJavaTypeWithJavaAnnotation.txt @@ -1,72 +1,72 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] i: JavaInterface): { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] i: JavaInterface): { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] i: JavaInterface): { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe([ResolvedTo(COMPANION_GENERATION)] i: JavaInterface): { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe([ResolvedTo(SUPER_TYPES)] i: JavaInterface): { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe([ResolvedTo(TYPES)] i: R|JavaInterface|): { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe([ResolvedTo(STATUS)] i: R|JavaInterface|): { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe([ResolvedTo(EXPECT_ACTUAL_MATCHING)] i: R|JavaInterface|): { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] i: R|JavaInterface|): { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe([ResolvedTo(CONTRACTS)] i: R|JavaInterface|): { ^resolveMe i#.id# } IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] i: R|JavaInterface|): R|kotlin/Int| { ^resolveMe R|/i|.R|/JavaInterface.id| } ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] i: R|JavaInterface|): R|kotlin/Int| { ^resolveMe R|/i|.R|/JavaInterface.id| } BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] main.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe([ResolvedTo(BODY_RESOLVE)] i: R|JavaInterface|): R|kotlin/Int| { ^resolveMe R|/i|.R|/JavaInterface.id| } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClass.txt index fc45d27dbd1..e1948adc275 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClass.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -20,7 +20,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationOnLocalClass.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt TYPES: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt STATUS: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -208,7 +208,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -236,7 +236,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt index 56e583bd6d5..96223d66faf 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -39,7 +39,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationParameters.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -117,7 +117,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -195,7 +195,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt TYPES: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -234,7 +234,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt STATUS: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -273,7 +273,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -312,7 +312,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -351,7 +351,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -391,7 +391,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -431,7 +431,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> @@ -471,7 +471,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgument.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgument.txt index 570acf23112..8efdc5a1453 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgument.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgument.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -14,7 +14,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationWithTypeArgument.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -28,7 +28,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt TYPES: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt STATUS: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -98,7 +98,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -141,7 +141,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { LAZY_super @@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno<[ResolvedTo(STATUS)] T : R|kotlin/Number|> : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Number|>([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.value] value: ): R|one/Anno| { LAZY_super @@ -171,7 +171,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno<[ResolvedTo(STATUS)] T : R|kotlin/Number|> : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Number|>([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.value] value: ): R|one/Anno| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classMembers.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classMembers.txt index 9daeee388cf..697b202e785 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classMembers.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classMembers.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -19,7 +19,7 @@ FILE: [ResolvedTo(RAW_FIR)] classMembers.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -38,7 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -76,7 +76,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt TYPES: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -114,7 +114,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt STATUS: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -133,7 +133,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -152,7 +152,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -171,7 +171,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -192,7 +192,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -234,7 +234,7 @@ FILE: [ResolvedTo(IMPORTS)] classMembers.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] classMembers.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTarget.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTarget.txt index f6f64f6ae55..a36574d1a5f 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTarget.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/annotationWithTarget.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @Target[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| { LAZY_super @@ -22,7 +22,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationWithTarget.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @Target[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| { LAZY_super @@ -44,7 +44,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| { LAZY_super @@ -66,7 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| { LAZY_super @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| { LAZY_super @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt TYPES: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/ResolveMe.value] value: Int): R|ResolveMe| { LAZY_super @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt STATUS: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| { LAZY_super @@ -154,7 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| { LAZY_super @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](String(string)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| { LAZY_super @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](String(string)) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| { LAZY_super @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.CLASS|) @R|Anno|[Types](String(string)) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| { LAZY_super @@ -242,7 +242,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @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(ANNOTATIONS_ARGUMENTS_MAPPING)] annotation class ResolveMe : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/ResolveMe.value] value: R|kotlin/Int|): R|ResolveMe| { LAZY_super @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationWithTarget.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @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| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParameters.txt index 90777915714..95e33328194 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParameters.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/classWithTypeParameters.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe| { LAZY_super @@ -10,7 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] classWithTypeParameters.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K>(): R|ResolveMe| { LAZY_super @@ -20,7 +20,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class ResolveMe<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] T : Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] K> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] T : Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] K>(): R|ResolveMe| { LAZY_super @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] class ResolveMe<[ResolvedTo(COMPANION_GENERATION)] T : Int, [ResolvedTo(COMPANION_GENERATION)] K> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(COMPANION_GENERATION)] T : Int, [ResolvedTo(COMPANION_GENERATION)] K>(): R|ResolveMe| { LAZY_super @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class ResolveMe<[ResolvedTo(SUPER_TYPES)] T : Int, [ResolvedTo(SUPER_TYPES)] K> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(SUPER_TYPES)] T : Int, [ResolvedTo(SUPER_TYPES)] K>(): R|ResolveMe| { LAZY_super @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt TYPES: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class ResolveMe<[ResolvedTo(TYPES)] T : R|kotlin/Int|, [ResolvedTo(TYPES)] K> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(TYPES)] T : R|kotlin/Int|, [ResolvedTo(TYPES)] K>(): R|ResolveMe| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt STATUS: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K>(): R|ResolveMe| { LAZY_super @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class ResolveMe<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K>(): R|ResolveMe| { LAZY_super @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class ResolveMe<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K>(): R|ResolveMe| { LAZY_super @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] class ResolveMe<[ResolvedTo(CONTRACTS)] T : R|kotlin/Int|, [ResolvedTo(CONTRACTS)] K> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(CONTRACTS)] T : R|kotlin/Int|, [ResolvedTo(CONTRACTS)] K>(): R|ResolveMe| { LAZY_super @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class ResolveMe<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] K> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] K>(): R|ResolveMe| { LAZY_super @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class ResolveMe<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T : R|kotlin/Int|, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] K> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] constructor<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T : R|kotlin/Int|, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] K>(): R|ResolveMe| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] classWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container 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| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClass.txt index 30001522727..56a068c88e0 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/functionInValueClass.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| { LAZY_super @@ -15,7 +15,7 @@ FILE: [ResolvedTo(RAW_FIR)] functionInValueClass.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| { LAZY_super @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| { LAZY_super @@ -45,7 +45,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @JvmInline[Unresolved]() public? final? inline [ResolvedTo(RAW_FIR)] class Value : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @JvmInline[Unresolved]() public? final? inline [ResolvedTo(SUPER_TYPES)] class Value : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Value] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Value.value] value: Int): R|Value| { LAZY_super @@ -75,7 +75,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt TYPES: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/jvm/JvmInline|[Types]() public? final? inline [ResolvedTo(TYPES)] class Value : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=Value] constructor([ResolvedTo(TYPES)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| { LAZY_super @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt STATUS: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| { LAZY_super @@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| { LAZY_super @@ -135,7 +135,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| { LAZY_super @@ -151,7 +151,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| { LAZY_super @@ -167,7 +167,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| { LAZY_super @@ -183,7 +183,7 @@ FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionInValueClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/jvm/JvmInline|[Types]() public final inline [ResolvedTo(STATUS)] [FirValueClassRepresentationKey=InlineClassRepresentation(underlyingPropertyName=value, underlyingType=kotlin/Int)] class Value : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Value] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Value.value] value: R|kotlin/Int|): R|Value| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverride.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverride.txt index 3ebf2fc893e..3e311de5bf8 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverride.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverride.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -30,7 +30,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverride.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -210,7 +210,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -270,7 +270,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -300,7 +300,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -330,7 +330,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -360,7 +360,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass.txt index 0bf772dfb9b..31a6042307e 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -71,7 +71,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -142,7 +142,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -355,7 +355,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -426,7 +426,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -497,7 +497,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -568,7 +568,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -639,7 +639,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -710,7 +710,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -781,7 +781,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -852,7 +852,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2.txt index 95ee1d0b6c1..0d98f527f01 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -71,7 +71,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -142,7 +142,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -355,7 +355,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -426,7 +426,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -497,7 +497,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -568,7 +568,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -639,7 +639,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -710,7 +710,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -781,7 +781,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -852,7 +852,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3.txt index 1fdf198855f..650f237ee94 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass3.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -71,7 +71,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass3.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -142,7 +142,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -355,7 +355,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -426,7 +426,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -497,7 +497,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -568,7 +568,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -639,7 +639,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -710,7 +710,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -781,7 +781,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -852,7 +852,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4.txt index 77402564df8..bd7c75ae61f 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/hierarchyWithOverrideAndNestedClass4.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -71,7 +71,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass4.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -142,7 +142,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -355,7 +355,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -426,7 +426,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -497,7 +497,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -568,7 +568,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -639,7 +639,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -710,7 +710,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -781,7 +781,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -852,7 +852,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClass.txt index ea5affda834..179ed1383f6 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClass.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -29,7 +29,7 @@ FILE: [ResolvedTo(RAW_FIR)] nestedClass.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -58,7 +58,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -87,7 +87,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -145,7 +145,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt TYPES: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -174,7 +174,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt STATUS: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -232,7 +232,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -290,7 +290,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -319,7 +319,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -348,7 +348,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt index ecefc224872..6db652df8f2 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A @@ -25,7 +25,7 @@ FILE: [ResolvedTo(RAW_FIR)] nestedClassWithPropertiesOverrides.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A @@ -75,7 +75,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface OV : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface OV : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A @@ -125,7 +125,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt TYPES: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] interface OV : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] val originalExpressions: A public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OV] get(): A @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt STATUS: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A| public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A| @@ -175,7 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A| public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A| @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A| public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A| @@ -225,7 +225,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A| public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A| @@ -250,7 +250,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A| public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A| @@ -275,7 +275,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A| public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A| @@ -300,7 +300,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedClassWithPropertiesOverrides.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface OV : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] val originalExpressions: R|A| public [ResolvedTo(STATUS)] [ContainingClassKey=OV] get(): R|A| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride.txt index 79be24f3f2d..4b4f4f497fc 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -16,7 +16,7 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : /Foo2> { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] interface Foo1 : /Foo2> { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt STATUS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(EXPECT_ACTUAL_MATCHING)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(CONTRACTS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -192,7 +192,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride2.txt index 06e5e8e5e77..b64dc80be6f 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/simpleLoopInOverride2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -16,7 +16,7 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : /Foo2> { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] interface Foo1 : /Foo2> { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(EXPECT_ACTUAL_MATCHING)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(CONTRACTS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -192,7 +192,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(BODY_RESOLVE)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClass.txt index 06d7273f630..6bf60c7697f 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/compilerRequiredAnnotationOnLocalClass.txt @@ -1,51 +1,51 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { @@ -65,7 +65,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { @@ -85,7 +85,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { @Deprecated[Unresolved](message = String(), replaceWith = ReplaceWith#(expression = String(abc)), level = DeprecationLevel#.ERROR#) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { @@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationOnLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container 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| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchy.txt b/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchy.txt index 14dc2c97b18..34859ed9789 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchy.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/complexLocalHierarchy.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { @@ -121,7 +121,7 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface NonLocalInterface : R|kotlin/Any| { } public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] complexLocalHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface NonLocalInterface : R|kotlin/Any| { } public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclaration.txt b/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclaration.txt index a35b3227266..57400cc236d 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclaration.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/complexRedeclaration.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -93,7 +93,7 @@ FILE: [ResolvedTo(RAW_FIR)] complexRedeclaration.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -279,7 +279,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? sealed [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -372,7 +372,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? sealed [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -465,7 +465,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt TYPES: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? sealed [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -558,7 +558,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt STATUS: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? sealed [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -651,7 +651,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? sealed [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -744,7 +744,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| { protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -837,7 +837,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| { protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -930,7 +930,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| { protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -1023,7 +1023,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| { protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -1116,7 +1116,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public sealed [ResolvedTo(STATUS)] class A : R|kotlin/Any| { protected [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy.txt index 86f32d4d9fe..fd85d1b1755 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe { } public? final? [ResolvedTo(RAW_FIR)] interface C : B { @@ -16,7 +16,7 @@ FILE: [ResolvedTo(RAW_FIR)] cyclicHierarchy.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe { } public? final? [ResolvedTo(RAW_FIR)] interface C : B { @@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe { } public? final? [ResolvedTo(RAW_FIR)] interface C : B { @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe { } public? final? [ResolvedTo(RAW_FIR)] interface C : B { @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /B> { @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /B> { @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt STATUS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /B> { @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /B> { @@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /B> { @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /B> { @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /B> { @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /B> { @@ -192,7 +192,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /B> { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy2.txt index 0efa8037ae0..4eaf6dce8a9 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface ResolveMe : A, E { } public? final? [ResolvedTo(RAW_FIR)] interface C : ResolveMe { @@ -16,7 +16,7 @@ FILE: [ResolvedTo(RAW_FIR)] cyclicHierarchy2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface ResolveMe : A, E { } public? final? [ResolvedTo(RAW_FIR)] interface C : ResolveMe { @@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] interface ResolveMe : A, E { } public? final? [ResolvedTo(RAW_FIR)] interface C : ResolveMe { @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] interface ResolveMe : A, E { } public? final? [ResolvedTo(RAW_FIR)] interface C : ResolveMe { @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface ResolveMe : , /E> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /ResolveMe> { @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] interface ResolveMe : , /E> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /ResolveMe> { @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface ResolveMe : , /E> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /ResolveMe> { @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(EXPECT_ACTUAL_MATCHING)] interface ResolveMe : , /E> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /ResolveMe> { @@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] interface ResolveMe : , /E> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /ResolveMe> { @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(CONTRACTS)] interface ResolveMe : , /E> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /ResolveMe> { @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] interface ResolveMe : , /E> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /ResolveMe> { @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] interface ResolveMe : , /E> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /ResolveMe> { @@ -192,7 +192,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(BODY_RESOLVE)] interface ResolveMe : , /E> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C : /ResolveMe> { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy3.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy3.txt index d8480d02785..0867cab40b8 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy3.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicHierarchy3.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe { } public? final? [ResolvedTo(RAW_FIR)] interface C1 : B { @@ -20,7 +20,7 @@ FILE: [ResolvedTo(RAW_FIR)] cyclicHierarchy3.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe { } public? final? [ResolvedTo(RAW_FIR)] interface C1 : B { @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe { } public? final? [ResolvedTo(RAW_FIR)] interface C1 : B { @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface B : A, ResolveMe { } public? final? [ResolvedTo(RAW_FIR)] interface C1 : B { @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : /B> { @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : /B> { @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt STATUS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : /B> { @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : /B> { @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : /B> { @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : /B> { @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : /B> { @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : /B> { @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicHierarchy3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface B : , /ResolveMe> { } public? final? [ResolvedTo(SUPER_TYPES)] interface C1 : /B> { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy.txt index aaa67337b4e..dfba6fc1cdd 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class C : D { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -23,7 +23,7 @@ FILE: [ResolvedTo(RAW_FIR)] cyclicNestedHierarchy.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class C : D { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -46,7 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class C : D { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(COMPANION_GENERATION)] class C : D { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -115,7 +115,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -138,7 +138,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt STATUS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class C : /D> { public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -161,7 +161,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class C : /D> { public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class C : /D> { public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(CONTRACTS)] class C : /D> { public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -230,7 +230,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class C : /D> { public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -253,7 +253,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class C : /D> { public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -276,7 +276,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(BODY_RESOLVE)] class C : /D> { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy2.txt index 9b5d34005a5..faece875d02 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/cyclicNestedHierarchy2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class C : D { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -23,7 +23,7 @@ FILE: [ResolvedTo(RAW_FIR)] cyclicNestedHierarchy2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class C : D { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -46,7 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class C : D { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class C : D { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -115,7 +115,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -138,7 +138,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -161,7 +161,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -230,7 +230,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -253,7 +253,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class C : /D> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super @@ -276,7 +276,7 @@ FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] cyclicNestedHierarchy2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class C : /D> { public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopy.txt b/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopy.txt index 3426ca7bf65..39300076d42 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopy.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/dataClassCopy.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -22,7 +22,7 @@ FILE: [ResolvedTo(RAW_FIR)] dataClassCopy.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -44,7 +44,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -66,7 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(SUPER_TYPES)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt TYPES: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(TYPES)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=DataClass] constructor([ResolvedTo(TYPES)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(TYPES)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt STATUS: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -154,7 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -242,7 +242,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2.txt index 5ce5cda91e9..444fc41d529 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/dataComponent2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -22,7 +22,7 @@ FILE: [ResolvedTo(RAW_FIR)] dataComponent2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -44,7 +44,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -66,7 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(SUPER_TYPES)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=DataClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? data [ResolvedTo(TYPES)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=DataClass] constructor([ResolvedTo(TYPES)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(TYPES)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -154,7 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -242,7 +242,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(STATUS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/delegatedField.txt b/analysis/low-level-api-fir/testdata/lazyResolve/delegatedField.txt index ae756d9e632..24119940480 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/delegatedField.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/delegatedField.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -24,7 +24,7 @@ FILE: [ResolvedTo(RAW_FIR)] delegatedField.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt TYPES: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt STATUS: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -168,7 +168,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -192,7 +192,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -216,7 +216,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super @@ -288,7 +288,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] delegatedField.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Boo : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Boo] constructor(): R|one/Boo| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt b/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt index 08e89e952e7..878ebc0b159 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/delegates.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val delegate: = LAZY_EXPRESSION @@ -30,7 +30,7 @@ FILE: [ResolvedTo(RAW_FIR)] delegates.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val delegate: = LAZY_EXPRESSION @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val delegate: = LAZY_EXPRESSION @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val delegate: = LAZY_EXPRESSION @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val delegate: = LAZY_EXPRESSION @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt TYPES: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val delegate: = LAZY_EXPRESSION @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt STATUS: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val delegate: = LAZY_EXPRESSION @@ -210,7 +210,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val delegate: = LAZY_EXPRESSION @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val delegate: = LAZY_EXPRESSION @@ -270,7 +270,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { receive#(valueWithExplicitType#) receive#(valueWithImplicitType#) @@ -305,7 +305,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { receive#(valueWithExplicitType#) receive#(valueWithImplicitType#) @@ -340,7 +340,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { receive#(valueWithExplicitType#) receive#(valueWithImplicitType#) @@ -375,7 +375,7 @@ FILE: [ResolvedTo(IMPORTS)] delegates.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] delegates.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { R|/receive|(R|/valueWithExplicitType|) R|/receive|(R|/valueWithImplicitType|) diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntries.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntries.txt index c8e8915d414..5d96b9423e1 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntries.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntries.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -20,7 +20,7 @@ FILE: [ResolvedTo(RAW_FIR)] enumEntries.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt TYPES: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(TYPES)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt STATUS: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntries.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] enumEntries.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt index a8089ff2204..53fdfd7f3a5 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -26,7 +26,7 @@ FILE: [ResolvedTo(RAW_FIR)] enumEntry.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -52,7 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -104,7 +104,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -130,7 +130,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt TYPES: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt STATUS: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -182,7 +182,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -208,7 +208,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -234,7 +234,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -266,7 +266,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -298,7 +298,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super @@ -330,7 +330,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntry.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOf.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOf.txt index 8b7ef0bd280..64e03e32217 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOf.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumValueOf.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -20,7 +20,7 @@ FILE: [ResolvedTo(RAW_FIR)] enumValueOf.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt TYPES: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(TYPES)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt STATUS: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] enumValueOf.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumValues.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumValues.txt index 951b4728707..81a7dfe4453 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/enumValues.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumValues.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -20,7 +20,7 @@ FILE: [ResolvedTo(RAW_FIR)] enumValues.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt TYPES: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(TYPES)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt STATUS: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] enumValues.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] enumValues.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class MyEnum : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=MyEnum] constructor(): R|one/MyEnum| { LAZY_super|> diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/errors/annotationWithNamedFunctionArgument.txt b/analysis/low-level-api-fir/testdata/lazyResolve/errors/annotationWithNamedFunctionArgument.txt index c49dbf3e0ec..69ee2611e91 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/errors/annotationWithNamedFunctionArgument.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/errors/annotationWithNamedFunctionArgument.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -10,7 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationWithNamedFunctionArgument.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -20,7 +20,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt TYPES: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt STATUS: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](ERROR_EXPR(Incorrect invoke receiver)local final? [ResolvedTo(RAW_FIR)] fun a(): String { } .invoke#()) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class TopLevelClass : R|kotlin/Any| { @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](ERROR_EXPR(Incorrect invoke receiver)local final? [ResolvedTo(RAW_FIR)] fun a(): String { } .invoke#()) public final [ResolvedTo(CONTRACTS)] class TopLevelClass : R|kotlin/Any| { @@ -104,7 +104,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types](ERROR_EXPR(Incorrect invoke receiver)local final? [ResolvedTo(RAW_FIR)] fun a(): String { } .invoke#()) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] annotationWithNamedFunctionArgument.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container @[Types]() public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/errors/anonymousObjectInInvalidPosition.txt b/analysis/low-level-api-fir/testdata/lazyResolve/errors/anonymousObjectInInvalidPosition.txt index b0bcf78a16c..b065ca32e94 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/errors/anonymousObjectInInvalidPosition.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/errors/anonymousObjectInInvalidPosition.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final? [ResolvedTo(RAW_FIR)] val resolveMe: A = LAZY_EXPRESSION private [ResolvedTo(RAW_FIR)] get(): A public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { @@ -10,7 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] anonymousObjectInInvalidPosition.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final? [ResolvedTo(RAW_FIR)] val resolveMe: A = LAZY_EXPRESSION private [ResolvedTo(RAW_FIR)] get(): A public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { @@ -20,7 +20,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val resolveMe: A = LAZY_EXPRESSION private [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): A public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final? [ResolvedTo(COMPANION_GENERATION)] val resolveMe: A = LAZY_EXPRESSION private [ResolvedTo(COMPANION_GENERATION)] get(): A public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final? [ResolvedTo(SUPER_TYPES)] val resolveMe: A = LAZY_EXPRESSION private [ResolvedTo(SUPER_TYPES)] get(): A public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt TYPES: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final? [ResolvedTo(TYPES)] val resolveMe: = LAZY_EXPRESSION private [ResolvedTo(TYPES)] get(): public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt STATUS: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final [ResolvedTo(STATUS)] val resolveMe: = LAZY_EXPRESSION private [ResolvedTo(STATUS)] get(): public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val resolveMe: = LAZY_EXPRESSION private [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val resolveMe: = LAZY_EXPRESSION private [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): public? final? [ResolvedTo(RAW_FIR)] interface A<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final [ResolvedTo(CONTRACTS)] val resolveMe: = ERROR_EXPR(Should have initializer)Null(null) = object : A { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { super<>() @@ -109,7 +109,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val resolveMe: = ERROR_EXPR(Should have initializer)Null(null) = object : R|A| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { super() @@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val resolveMe: = ERROR_EXPR(Should have initializer)Null(null) = object : R|A| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { super() @@ -147,7 +147,7 @@ FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] anonymousObjectInInvalidPosition.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container private final [ResolvedTo(BODY_RESOLVE)] val resolveMe: = ERROR_EXPR(Should have initializer)Null(null) = object : R|A| { private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] constructor(): R|| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fakeOverride.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fakeOverride.txt index 0e1a36b0d92..ba72189e2c3 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/fakeOverride.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/fakeOverride.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun expression([ResolvedTo(RAW_FIR)] expression: IrConst<*>): R|kotlin/Unit| { LAZY_BLOCK } public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind| { @@ -39,7 +39,7 @@ FILE: [ResolvedTo(RAW_FIR)] fakeOverride.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun expression([ResolvedTo(RAW_FIR)] expression: IrConst<*>): R|kotlin/Unit| { LAZY_BLOCK } public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind| { @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun expression([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] expression: IrConst<*>): R|kotlin/Unit| { LAZY_BLOCK } public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind| { @@ -117,7 +117,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun expression([ResolvedTo(COMPANION_GENERATION)] expression: IrConst<*>): R|kotlin/Unit| { LAZY_BLOCK } public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind| { @@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun expression([ResolvedTo(SUPER_TYPES)] expression: IrConst<*>): R|kotlin/Unit| { LAZY_BLOCK } public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind| { @@ -195,7 +195,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt TYPES: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun expression([ResolvedTo(TYPES)] expression: R|IrConst<*>|): R|kotlin/Unit| { LAZY_BLOCK } public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind| { @@ -234,7 +234,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt STATUS: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun expression([ResolvedTo(STATUS)] expression: R|IrConst<*>|): R|kotlin/Unit| { LAZY_BLOCK } public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind| { @@ -273,7 +273,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun expression([ResolvedTo(EXPECT_ACTUAL_MATCHING)] expression: R|IrConst<*>|): R|kotlin/Unit| { LAZY_BLOCK } public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind| { @@ -312,7 +312,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun expression([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] expression: R|IrConst<*>|): R|kotlin/Unit| { LAZY_BLOCK } public? sealed [ResolvedTo(RAW_FIR)] class Kind<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { protected [ResolvedTo(RAW_FIR)] [ContainingClassKey=Kind] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Kind.asString] asString: String): R|Kind| { @@ -351,7 +351,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun expression([ResolvedTo(CONTRACTS)] expression: R|IrConst<*>|): R|kotlin/Unit| { when ([ResolvedTo(RAW_FIR)] lval kind: = expression#.kind#) { ($subj$ is Kind.Null) -> { @@ -399,7 +399,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun expression([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] expression: R|IrConst<*>|): R|kotlin/Unit| { when ([ResolvedTo(RAW_FIR)] lval kind: = expression#.kind#) { ($subj$ is Kind.Null) -> { @@ -447,7 +447,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun expression([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] expression: R|IrConst<*>|): R|kotlin/Unit| { when ([ResolvedTo(RAW_FIR)] lval kind: = expression#.kind#) { ($subj$ is Kind.Null) -> { @@ -495,7 +495,7 @@ FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] fakeOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun expression([ResolvedTo(BODY_RESOLVE)] expression: R|IrConst<*>|): R|kotlin/Unit| { when ([ResolvedTo(BODY_RESOLVE)] lval kind: R|Kind| = R|/expression|.R|SubstitutionOverride|>|) { ($subj$ is R|Kind.Null|) -> { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructor.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructor.txt index 24e47535063..8a725e6d9ca 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructor.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/fakePrimaryConstructor.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -12,7 +12,7 @@ FILE: [ResolvedTo(RAW_FIR)] fakePrimaryConstructor.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class Problem : R|kotlin/Any| { public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt TYPES: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class Problem : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt STATUS: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fileAnnotations.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fileAnnotations.txt index 1c8142022da..1a3de4126a5 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/fileAnnotations.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/fileAnnotations.txt @@ -188,8 +188,8 @@ FILE: [ResolvedTo(IMPORTS)] fileAnnotations.kt LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: String = R|/s| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuter.txt index f0c0fe6f313..149d4449c30 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/fromLocalHierarchyToOuter.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -23,7 +23,7 @@ FILE: [ResolvedTo(RAW_FIR)] fromLocalHierarchyToOuter.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -46,7 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -115,7 +115,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt TYPES: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -138,7 +138,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt STATUS: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -161,7 +161,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -251,7 +251,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -295,7 +295,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -339,7 +339,7 @@ FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] fromLocalHierarchyToOuter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameter.txt index 97fe0684568..bf63bd2a151 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameter.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] param: I): { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] param: I): { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe([ResolvedTo(COMPANION_GENERATION)] param: I): { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe([ResolvedTo(SUPER_TYPES)] param: I): { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public? final? [ResolvedTo(TYPES)] fun resolveMe([ResolvedTo(TYPES)] param: R|I|): { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public final [ResolvedTo(STATUS)] fun resolveMe([ResolvedTo(STATUS)] param: R|I|): { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe([ResolvedTo(EXPECT_ACTUAL_MATCHING)] param: R|I|): { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] param: R|I|): { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public final [ResolvedTo(CONTRACTS)] fun resolveMe([ResolvedTo(CONTRACTS)] param: R|I|): { @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] param: R|I|): R|kotlin/Unit| { @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] param: R|I|): R|kotlin/Unit| { @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionWithParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe([ResolvedTo(BODY_RESOLVE)] param: R|I|): R|kotlin/Unit| { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResult.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResult.txt index 89100285758..6d7b2704cea 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResult.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResult.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -12,7 +12,7 @@ FILE: [ResolvedTo(RAW_FIR)] functionCallWithGenericResult.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt TYPES: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt STATUS: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -122,7 +122,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -136,7 +136,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameter.txt index 060aef380fe..10ca2ed9fdc 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionParameter.txt @@ -1,72 +1,72 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] param: Int): { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun foo([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] param: Int): { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun foo([ResolvedTo(COMPANION_GENERATION)] param: Int): { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun foo([ResolvedTo(SUPER_TYPES)] param: Int): { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun foo([ResolvedTo(TYPES)] param: R|kotlin/Int|): { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/Int|): { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo([ResolvedTo(EXPECT_ACTUAL_MATCHING)] param: R|kotlin/Int|): { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] param: R|kotlin/Int|): { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] param: R|kotlin/Int|): { ^foo String(boo) } IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] param: R|kotlin/Int|): R|kotlin/String| { ^foo String(boo) } ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] param: R|kotlin/Int|): R|kotlin/String| { ^foo String(boo) } BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] param: R|kotlin/Int|): R|kotlin/String| { ^foo String(boo) } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInside.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInside.txt index ccc6240f603..489053df1c8 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInside.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInside.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -18,7 +18,7 @@ FILE: [ResolvedTo(RAW_FIR)] functionWithGenericExpectedTypeInside.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -54,7 +54,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt TYPES: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt STATUS: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -162,7 +162,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -182,7 +182,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -202,7 +202,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo| { LAZY_super @@ -222,7 +222,7 @@ FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionWithGenericExpectedTypeInside.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class Foo<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor<[ResolvedTo(STATUS)] T : R|kotlin/CharSequence|>(): R|Foo| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParameters.txt index f74ec534ec1..e2511d16343 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParameters.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParameters.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun <[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] T : Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun <[ResolvedTo(COMPANION_GENERATION)] T : Int, [ResolvedTo(COMPANION_GENERATION)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun <[ResolvedTo(SUPER_TYPES)] T : Int, [ResolvedTo(SUPER_TYPES)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun <[ResolvedTo(TYPES)] T : R|kotlin/Int|, [ResolvedTo(TYPES)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T : R|kotlin/Int|, [ResolvedTo(CONTRACTS)] K> resolveMe(): R|kotlin/Unit| { } IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun <[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] K> resolveMe(): R|kotlin/Unit| { } ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T : R|kotlin/Int|, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] K> resolveMe(): R|kotlin/Unit| { } BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] functionWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K> resolveMe(): R|kotlin/Unit| { } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverride.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverride.txt index 43c0667a6cd..0cc0be1bad5 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverride.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverride.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -30,7 +30,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverride.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -210,7 +210,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -270,7 +270,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -301,7 +301,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -332,7 +332,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -363,7 +363,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass.txt index 79bbd348a71..b90d361e4cb 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -71,7 +71,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -142,7 +142,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -355,7 +355,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -426,7 +426,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -497,7 +497,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -568,7 +568,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -639,7 +639,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -711,7 +711,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -783,7 +783,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -855,7 +855,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2.txt index de16098cdf2..083ef93b722 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -71,7 +71,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -142,7 +142,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -355,7 +355,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -426,7 +426,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -497,7 +497,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -568,7 +568,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -639,7 +639,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -711,7 +711,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -783,7 +783,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -855,7 +855,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3.txt index 51b13847626..60f74c7cc60 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/hierarchyWithOverrideAndNestedClass3.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -71,7 +71,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass3.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -142,7 +142,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -355,7 +355,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -426,7 +426,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -497,7 +497,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -568,7 +568,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -639,7 +639,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -711,7 +711,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -783,7 +783,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -855,7 +855,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride.txt index e56c2efeb78..9a98ad9296b 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -16,7 +16,7 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun foo(): R|kotlin/Unit| @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(COMPANION_GENERATION)] fun foo(): R|kotlin/Unit| @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : /Foo2> { public? open? override [ResolvedTo(SUPER_TYPES)] fun foo(): R|kotlin/Unit| @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] interface Foo1 : /Foo2> { public? open? override [ResolvedTo(TYPES)] fun foo(): R|kotlin/Unit| @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt STATUS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo(): R|kotlin/Unit| @@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Unit| @@ -192,7 +192,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride2.txt index ecc086ea925..510045e0304 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/simpleLoopInOverride2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -16,7 +16,7 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun foo(): R|kotlin/Unit| @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(COMPANION_GENERATION)] fun foo(): R|kotlin/Unit| @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : /Foo2> { public? final? [ResolvedTo(SUPER_TYPES)] fun foo(): R|kotlin/Unit| @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] interface Foo1 : /Foo2> { public? final? [ResolvedTo(TYPES)] fun foo(): R|kotlin/Unit| @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo(): R|kotlin/Unit| @@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Unit| @@ -192,7 +192,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterface.txt b/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterface.txt index f507458e0a9..331c2aabccf 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterface.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterface.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -16,7 +16,7 @@ FILE: [ResolvedTo(RAW_FIR)] lambdaAsSAMInterface.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt TYPES: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt STATUS: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -165,7 +165,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] lambdaAsSAMInterface.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Arg : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/lazyProperty.txt b/analysis/low-level-api-fir/testdata/lazyResolve/lazyProperty.txt index dc82ce4106c..8bc653b64c9 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/lazyProperty.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/lazyProperty.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -29,7 +29,7 @@ FILE: [ResolvedTo(RAW_FIR)] lazyProperty.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -58,7 +58,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -87,7 +87,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -145,7 +145,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt TYPES: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -174,7 +174,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt STATUS: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -232,7 +232,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class LazyDelegate<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(RAW_FIR)] T>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/LazyDelegate.value] value: T): R|LazyDelegate| { LAZY_super @@ -293,7 +293,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate| { LAZY_super @@ -331,7 +331,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate| { LAZY_super @@ -369,7 +369,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class LazyDelegate<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=LazyDelegate] constructor<[ResolvedTo(STATUS)] T>([ResolvedTo(STATUS)] [CorrespondingProperty=/LazyDelegate.value] value: R|T|): R|LazyDelegate| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructor.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructor.txt index 72b5221b08b..edfe72a2ee3 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/localConstructor.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/localConstructor.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -13,7 +13,7 @@ FILE: [ResolvedTo(RAW_FIR)] localConstructor.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -26,7 +26,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -39,7 +39,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class Q : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -52,7 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public? final? [ResolvedTo(SUPER_TYPES)] class Q : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -65,7 +65,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt TYPES: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public? final? [ResolvedTo(TYPES)] class Q : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt STATUS: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -91,7 +91,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -104,7 +104,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -117,7 +117,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] T> magic(): T { LAZY_BLOCK } public final [ResolvedTo(STATUS)] class Q : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Q] constructor(): R|Q| { @@ -151,7 +151,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T> magic(): R|T| { ^magic Null(null)!! } @@ -187,7 +187,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T> magic(): R|T| { ^magic Null(null)!! } @@ -223,7 +223,7 @@ FILE: [ResolvedTo(IMPORTS)] localConstructor.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T> magic(): R|T| { ^magic Null(null)!! } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCall.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCall.txt index cf0bde1cbc6..c8252982eb7 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCall.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCall.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -21,7 +21,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -63,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt STATUS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -147,7 +147,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -168,7 +168,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -189,7 +189,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -210,7 +210,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -231,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super @@ -252,7 +252,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.s] s: R|kotlin/String|): R|one/Anno| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteral.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteral.txt index 9ea19a66b70..51230b59044 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteral.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideFunctionLiteral.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -21,7 +21,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -63,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt STATUS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -147,7 +147,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -168,7 +168,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -189,7 +189,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -210,7 +210,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -231,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super @@ -252,7 +252,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideFunctionLiteral.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] i: R|() -> kotlin/Unit|): R|one/ClassWithParameter| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplate.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplate.txt index 7c24a531a1c..1225e590d56 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplate.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideLambdaCallInsideStringTemplate.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -23,7 +23,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -46,7 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -115,7 +115,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -138,7 +138,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt STATUS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -161,7 +161,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -230,7 +230,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -253,7 +253,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -276,7 +276,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideLambdaCallInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplate.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplate.txt index 9d3fb470a63..2d46af002be 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplate.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideStringTemplate.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -19,7 +19,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -38,7 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -76,7 +76,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -114,7 +114,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt STATUS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -133,7 +133,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -152,7 +152,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -171,7 +171,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -190,7 +190,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super @@ -228,7 +228,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideStringTemplate.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class ClassWithParameter : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=ClassWithParameter] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|one/ClassWithParameter| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCall.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCall.txt index 92a317fbca2..f7e8dbccf1c 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCall.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideSuperEntryCall.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -29,7 +29,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -58,7 +58,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -87,7 +87,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -145,7 +145,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt TYPES: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -174,7 +174,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt STATUS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -232,7 +232,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -290,7 +290,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -319,7 +319,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -348,7 +348,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClass.txt index ca30fffa905..4f8464cae86 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/localNestedClass.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -23,7 +23,7 @@ FILE: [ResolvedTo(RAW_FIR)] localNestedClass.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -46,7 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -115,7 +115,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt TYPES: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -138,7 +138,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt STATUS: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -161,7 +161,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -184,7 +184,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -248,7 +248,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -289,7 +289,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super @@ -330,7 +330,7 @@ FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCall.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCall.txt index c54a85b4f02..0c8644f62dc 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCall.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/localParameterInsideSuperEntryCall.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -29,7 +29,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -58,7 +58,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -87,7 +87,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -145,7 +145,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt TYPES: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -174,7 +174,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt STATUS: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -232,7 +232,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -290,7 +290,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -319,7 +319,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| @@ -348,7 +348,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] param: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotations.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotations.txt index 45867972db4..576acb2b229 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotations.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotations.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -62,7 +62,7 @@ FILE: [ResolvedTo(RAW_FIR)] nestedCompilerRequiredAnnotations.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -124,7 +124,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -248,7 +248,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -310,7 +310,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt TYPES: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -372,7 +372,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt STATUS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -434,7 +434,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -496,7 +496,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -558,7 +558,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -620,7 +620,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -682,7 +682,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super @@ -744,7 +744,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotations.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt index a8f99e0b87d..8253f112093 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -62,7 +62,7 @@ FILE: [ResolvedTo(RAW_FIR)] nestedCompilerRequiredAnnotationsForMember.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -124,7 +124,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -248,7 +248,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -310,7 +310,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt TYPES: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -372,7 +372,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt STATUS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -434,7 +434,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -496,7 +496,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -558,7 +558,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -621,7 +621,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -684,7 +684,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super @@ -747,7 +747,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBody.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBody.txt index 53dd846ab54..d2621eea334 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBody.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsInsideBody.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -22,7 +22,7 @@ FILE: [ResolvedTo(RAW_FIR)] nestedCompilerRequiredAnnotationsInsideBody.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -44,7 +44,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -66,7 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt TYPES: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt STATUS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -154,7 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -282,7 +282,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.s] s: String): R|Anno| { LAZY_super @@ -324,7 +324,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsInsideBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias.txt index 971f6523a1b..4778e3a2aab 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : SuperForOuter { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass| { LAZY_super @@ -31,7 +31,7 @@ FILE: [ResolvedTo(RAW_FIR)] nestedTypeAlias.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : SuperForOuter { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass| { LAZY_super @@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : SuperForOuter { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass| { LAZY_super @@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : SuperForOuter { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass| { LAZY_super @@ -124,7 +124,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|SuperForOuter| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -155,7 +155,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt TYPES: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class OuterClass<[ResolvedTo(TYPES)] T1> : R|SuperForOuter| { public? [ResolvedTo(TYPES)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt STATUS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| { public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass| { LAZY_super @@ -217,7 +217,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| { public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass| { LAZY_super @@ -248,7 +248,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| { public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass| { LAZY_super @@ -279,7 +279,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| { public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass| { LAZY_super @@ -310,7 +310,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| { public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass| { LAZY_super @@ -341,7 +341,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| { public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass| { LAZY_super @@ -372,7 +372,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class OuterClass<[ResolvedTo(STATUS)] T1> : R|SuperForOuter| { public [ResolvedTo(STATUS)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(STATUS)] T1>(): R|OuterClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2.txt index de44ec94870..2a61a2eb117 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedTypeAlias2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass| { LAZY_super @@ -20,7 +20,7 @@ FILE: [ResolvedTo(RAW_FIR)] nestedTypeAlias2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass| { LAZY_super @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class OuterClass<[ResolvedTo(RAW_FIR)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(RAW_FIR)] T1>(): R|OuterClass| { LAZY_super @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] nestedTypeAlias2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class OuterClass<[ResolvedTo(SUPER_TYPES)] T1> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=OuterClass] constructor<[ResolvedTo(SUPER_TYPES)] T1>(): R|OuterClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt index 02b30c1bd2a..2be432ff658 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfNonLocalSetter.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -14,7 +14,7 @@ FILE: [ResolvedTo(RAW_FIR)] parameterOfNonLocalSetter.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -28,7 +28,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt TYPES: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class X : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt STATUS: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -98,7 +98,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -142,7 +142,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -158,7 +158,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -174,7 +174,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] parameterOfNonLocalSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetter.txt index 993a8837753..555e9f2ad22 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/parameterOfTopSetter.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] var x: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] var x: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] var x: Int = LAZY_EXPRESSION public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): Int public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] set([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] var x: Int = LAZY_EXPRESSION public? [ResolvedTo(COMPANION_GENERATION)] get(): Int public? [ResolvedTo(COMPANION_GENERATION)] set([ResolvedTo(COMPANION_GENERATION)] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] var x: Int = LAZY_EXPRESSION public? [ResolvedTo(SUPER_TYPES)] get(): Int public? [ResolvedTo(SUPER_TYPES)] set([ResolvedTo(SUPER_TYPES)] resolveMe: Int): R|kotlin/Unit| { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] var x: R|kotlin/Int| = LAZY_EXPRESSION public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| public? [ResolvedTo(TYPES)] set([ResolvedTo(TYPES)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = LAZY_EXPRESSION public [ResolvedTo(STATUS)] get(): R|kotlin/Int| public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var x: R|kotlin/Int| = LAZY_EXPRESSION public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var x: R|kotlin/Int| = LAZY_EXPRESSION public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] var x: R|kotlin/Int| = IntegerLiteral(2) public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var x: R|kotlin/Int| = Int(2) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] set([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = Int(2) public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] parameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(2) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] resolveMe: R|kotlin/Int|): R|kotlin/Unit| { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructor.txt b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructor.txt index 3368b201e33..42884a1a97c 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructor.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructor.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -12,7 +12,7 @@ FILE: [ResolvedTo(RAW_FIR)] primaryConstructor.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class Problem : R|kotlin/Any| { public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt TYPES: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class Problem : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt STATUS: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super @@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameter.txt index 9407f86d3b5..321bdb27927 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorParameter.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = LAZY_EXPRESSION, [ResolvedTo(RAW_FIR)] c: Long): R|A| { LAZY_super @@ -12,7 +12,7 @@ FILE: [ResolvedTo(RAW_FIR)] primaryConstructorParameter.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] param: Int = LAZY_EXPRESSION, [ResolvedTo(RAW_FIR)] c: Long): R|A| { LAZY_super @@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] a: Boolean, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] param: Int = LAZY_EXPRESSION, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] c: Long): R|A| { LAZY_super @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor([ResolvedTo(COMPANION_GENERATION)] a: Boolean, [ResolvedTo(COMPANION_GENERATION)] param: Int = LAZY_EXPRESSION, [ResolvedTo(COMPANION_GENERATION)] c: Long): R|A| { LAZY_super @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=A] constructor([ResolvedTo(SUPER_TYPES)] a: Boolean, [ResolvedTo(SUPER_TYPES)] param: Int = LAZY_EXPRESSION, [ResolvedTo(SUPER_TYPES)] c: Long): R|A| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt TYPES: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=A] constructor([ResolvedTo(TYPES)] a: R|kotlin/Boolean|, [ResolvedTo(TYPES)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(TYPES)] c: R|kotlin/Long|): R|A| { LAZY_super @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt STATUS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/Long|): R|A| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] a: R|kotlin/Boolean|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] c: R|kotlin/Long|): R|A| { LAZY_super @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] a: R|kotlin/Boolean|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] c: R|kotlin/Long|): R|A| { LAZY_super @@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] a: R|kotlin/Boolean|, [ResolvedTo(CONTRACTS)] param: R|kotlin/Int| = IntegerLiteral(1), [ResolvedTo(CONTRACTS)] c: R|kotlin/Long|): R|A| { super() @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] a: R|kotlin/Boolean|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] param: R|kotlin/Int| = IntegerLiteral(1), [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] c: R|kotlin/Long|): R|A| { super() @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] a: R|kotlin/Boolean|, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] param: R|kotlin/Int| = IntegerLiteral(1), [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] c: R|kotlin/Long|): R|A| { super() @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Boolean|, [ResolvedTo(BODY_RESOLVE)] param: R|kotlin/Int| = Int(1), [ResolvedTo(BODY_RESOLVE)] c: R|kotlin/Long|): R|A| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorProperty.txt b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorProperty.txt index 17a8dfb5455..685a3b13767 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorProperty.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/primaryConstructorProperty.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION): R|A| { LAZY_super @@ -15,7 +15,7 @@ FILE: [ResolvedTo(RAW_FIR)] primaryConstructorProperty.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] a: Boolean, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION): R|A| { LAZY_super @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] a: Boolean, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION): R|A| { LAZY_super @@ -45,7 +45,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor([ResolvedTo(COMPANION_GENERATION)] a: Boolean, [ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION): R|A| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=A] constructor([ResolvedTo(SUPER_TYPES)] a: Boolean, [ResolvedTo(SUPER_TYPES)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION): R|A| { LAZY_super @@ -75,7 +75,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt TYPES: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=A] constructor([ResolvedTo(TYPES)] a: R|kotlin/Boolean|, [ResolvedTo(TYPES)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| { LAZY_super @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt STATUS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] a: R|kotlin/Boolean|, [ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| { LAZY_super @@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] a: R|kotlin/Boolean|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] a: R|kotlin/Boolean|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| { LAZY_super @@ -135,7 +135,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] a: R|kotlin/Boolean|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = IntegerLiteral(42)): R|A| { super() @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] a: R|kotlin/Boolean|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = IntegerLiteral(42)): R|A| { super() @@ -165,7 +165,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] a: R|kotlin/Boolean|, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = IntegerLiteral(42)): R|A| { super() @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] a: R|kotlin/Boolean|, [ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = Int(42)): R|A| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverride.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverride.txt index dc8b537cdfa..1854c310ec7 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverride.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverride.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -33,7 +33,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverride.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -66,7 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -99,7 +99,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -165,7 +165,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -231,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -297,7 +297,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -330,7 +330,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -363,7 +363,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -396,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass.txt index c6b715bd107..3d2e6bfd342 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -74,7 +74,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -148,7 +148,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -222,7 +222,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -370,7 +370,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -444,7 +444,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -518,7 +518,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -592,7 +592,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -666,7 +666,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -740,7 +740,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -814,7 +814,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -888,7 +888,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2.txt index 10551a34479..dcb2d4cbbd3 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -74,7 +74,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -148,7 +148,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -222,7 +222,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -370,7 +370,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -444,7 +444,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -518,7 +518,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -592,7 +592,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -666,7 +666,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -740,7 +740,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -814,7 +814,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -888,7 +888,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3.txt index aac00566b40..fbe533136bb 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass3.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -74,7 +74,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass3.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -148,7 +148,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -222,7 +222,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -370,7 +370,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -444,7 +444,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -518,7 +518,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -592,7 +592,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -666,7 +666,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -740,7 +740,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -814,7 +814,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -888,7 +888,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass3.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4.txt index cf4dd56f7dc..750ee988259 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/hierarchyWithOverrideAndNestedClass4.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -77,7 +77,7 @@ FILE: [ResolvedTo(RAW_FIR)] hierarchyWithOverrideAndNestedClass4.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -154,7 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -231,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -308,7 +308,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -385,7 +385,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt TYPES: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : R|kotlin/Any| { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -462,7 +462,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt STATUS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -539,7 +539,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -616,7 +616,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -693,7 +693,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -770,7 +770,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -847,7 +847,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -924,7 +924,7 @@ FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] hierarchyWithOverrideAndNestedClass4.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : R|kotlin/Any| { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitType.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitType.txt index 025067c06d0..14e869c2429 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitType.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitType.txt @@ -1,60 +1,60 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val prop: Int public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val prop: Int public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val prop: Int public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): Int { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] val prop: Int public? [ResolvedTo(COMPANION_GENERATION)] get(): Int { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] val prop: Int public? [ResolvedTo(SUPER_TYPES)] get(): Int { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] val prop: R|kotlin/Int| public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] val prop: R|kotlin/Int| public [ResolvedTo(STATUS)] get(): R|kotlin/Int| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val prop: R|kotlin/Int| public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: R|kotlin/Int| public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] val prop: R|kotlin/Int| public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { ^ IntegerLiteral(42) @@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/Int| public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| { ^ IntegerLiteral(42) @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val prop: R|kotlin/Int| public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { ^ IntegerLiteral(42) @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] val prop: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { ^ Int(42) diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBody.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBody.txt index ec86f82ffb1..531c8156627 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBody.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithExplicitTypeAndBody.txt @@ -1,60 +1,60 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val prop: Int public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val prop: Int public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val prop: Int public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): Int { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] val prop: Int public? [ResolvedTo(COMPANION_GENERATION)] get(): Int { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] val prop: Int public? [ResolvedTo(SUPER_TYPES)] get(): Int { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] val prop: R|kotlin/Int| public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] val prop: R|kotlin/Int| public [ResolvedTo(STATUS)] get(): R|kotlin/Int| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val prop: R|kotlin/Int| public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: R|kotlin/Int| public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] val prop: R|kotlin/Int| public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { ^ IntegerLiteral(42) @@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/Int| public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| { ^ IntegerLiteral(42) @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val prop: R|kotlin/Int| public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { ^ IntegerLiteral(42) @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithExplicitTypeAndBody.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] val prop: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { ^ Int(42) diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitType.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitType.txt index a6c1c8c021d..c05c16f25aa 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitType.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyGetterWithImplicitType.txt @@ -1,60 +1,60 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val prop: public? [ResolvedTo(RAW_FIR)] get(): { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val prop: public? [ResolvedTo(RAW_FIR)] get(): { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val prop: public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] val prop: public? [ResolvedTo(COMPANION_GENERATION)] get(): { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] val prop: public? [ResolvedTo(SUPER_TYPES)] get(): { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] val prop: public? [ResolvedTo(TYPES)] get(): { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] val prop: public [ResolvedTo(STATUS)] get(): { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val prop: public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val prop: public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] val prop: public [ResolvedTo(CONTRACTS)] get(): { ^ IntegerLiteral(42) @@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/Int| public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| { ^ Int(42) @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val prop: R|kotlin/Int| public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { ^ Int(42) @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyGetterWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] val prop: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { ^ Int(42) diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetter.txt index 4676339dae2..8a0b694b63a 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertySetter.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] var prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: ): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] var prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: ): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] var prop: = LAZY_EXPRESSION public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] set([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] value: ): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] var prop: = LAZY_EXPRESSION public? [ResolvedTo(COMPANION_GENERATION)] get(): public? [ResolvedTo(COMPANION_GENERATION)] set([ResolvedTo(COMPANION_GENERATION)] value: ): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] var prop: = LAZY_EXPRESSION public? [ResolvedTo(SUPER_TYPES)] get(): public? [ResolvedTo(SUPER_TYPES)] set([ResolvedTo(SUPER_TYPES)] value: ): R|kotlin/Unit| { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] var prop: = LAZY_EXPRESSION public? [ResolvedTo(TYPES)] get(): public? [ResolvedTo(TYPES)] set([ResolvedTo(TYPES)] value: ): R|kotlin/Unit| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] var prop: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] get(): public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: ): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] var prop: = LAZY_EXPRESSION public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] set([ResolvedTo(EXPECT_ACTUAL_MATCHING)] value: ): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] var prop: = LAZY_EXPRESSION public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] set([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] value: ): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] var prop: = IntegerLiteral(42) public [ResolvedTo(CONTRACTS)] get(): public [ResolvedTo(CONTRACTS)] set([ResolvedTo(CONTRACTS)] value: ): R|kotlin/Unit| { @@ -71,7 +71,7 @@ FILE: [ResolvedTo(IMPORTS)] propertySetter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] var prop: R|kotlin/Int| = Int(42) 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| { @@ -79,7 +79,7 @@ FILE: [ResolvedTo(IMPORTS)] propertySetter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var prop: R|kotlin/Int| = Int(42) public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Int|): R|kotlin/Unit| { @@ -87,7 +87,7 @@ FILE: [ResolvedTo(IMPORTS)] propertySetter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertySetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] var prop: R|kotlin/Int| = Int(42) 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/lazyResolve/properties/propertyWithTypeParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParameters.txt index 219698859c1..1c201dcd9d0 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParameters.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/propertyWithTypeParameters.txt @@ -1,60 +1,60 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K public? [ResolvedTo(RAW_FIR)] get(): K { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> T.resolveMe: K public? [ResolvedTo(RAW_FIR)] get(): K { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val <[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] T : Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] K> T.resolveMe: K public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): K { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] val <[ResolvedTo(COMPANION_GENERATION)] T : Int, [ResolvedTo(COMPANION_GENERATION)] K> T.resolveMe: K public? [ResolvedTo(COMPANION_GENERATION)] get(): K { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] val <[ResolvedTo(SUPER_TYPES)] T : Int, [ResolvedTo(SUPER_TYPES)] K> T.resolveMe: K public? [ResolvedTo(SUPER_TYPES)] get(): K { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] val <[ResolvedTo(TYPES)] T : R|kotlin/Int|, [ResolvedTo(TYPES)] K> R|T|.resolveMe: R|K| public? [ResolvedTo(TYPES)] get(): R|K| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] val <[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> R|T|.resolveMe: R|K| public [ResolvedTo(STATUS)] get(): R|K| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K> R|T|.resolveMe: R|K| public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|K| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> R|T|.resolveMe: R|K| public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|K| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] val <[ResolvedTo(CONTRACTS)] T : R|kotlin/Int|, [ResolvedTo(CONTRACTS)] K> R|T|.resolveMe: R|K| public [ResolvedTo(CONTRACTS)] get(): R|K| { ^ TODO#() @@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val <[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] K> R|T|.resolveMe: R|K| public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|K| { ^ TODO#() @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val <[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T : R|kotlin/Int|, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] K> R|T|.resolveMe: R|K| public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|K| { ^ TODO#() @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] val <[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K> R|T|.resolveMe: R|K| public [ResolvedTo(BODY_RESOLVE)] get(): R|K| { ^ R|kotlin/TODO|() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride.txt index 2ef204909cf..fdd0c8171fe 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -25,7 +25,7 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -75,7 +75,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : /Foo2> { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -125,7 +125,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] interface Foo1 : /Foo2> { public? open? override [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt STATUS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -175,7 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -225,7 +225,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -250,7 +250,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -275,7 +275,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -300,7 +300,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract override [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride2.txt b/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride2.txt index 38b084a183d..a0ccff31d8b 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride2.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/properties/simpleLoopInOverride2.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -25,7 +25,7 @@ FILE: [ResolvedTo(RAW_FIR)] simpleLoopInOverride2.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -75,7 +75,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] interface Foo1 : Foo2 { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] interface Foo1 : /Foo2> { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -125,7 +125,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt TYPES: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] interface Foo1 : /Foo2> { public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt STATUS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -175,7 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -225,7 +225,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -250,7 +250,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -275,7 +275,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| @@ -300,7 +300,7 @@ FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] simpleLoopInOverride2.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public abstract [ResolvedTo(STATUS)] interface Foo1 : /Foo2> { public abstract [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetter.txt index 1f388252536..4275b1494c8 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetter.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int @@ -8,7 +8,7 @@ FILE: [ResolvedTo(RAW_FIR)] propertyWithGetter.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int @@ -16,7 +16,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int @@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int @@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt TYPES: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt STATUS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int @@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val withGetter: Int @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { receive#(withGetter#) } @@ -82,7 +82,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { receive#(withGetter#) } @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { receive#(withGetter#) } @@ -102,7 +102,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyWithGetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { R|/receive|(R|/withGetter|) } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetter.txt index 4fdeefaf30b..6ba188ee3aa 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithGetterAndSetter.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION @@ -9,7 +9,7 @@ FILE: [ResolvedTo(RAW_FIR)] propertyWithGetterAndSetter.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION @@ -27,7 +27,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION @@ -45,7 +45,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt TYPES: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION @@ -54,7 +54,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt STATUS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION @@ -63,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: Int): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] var withGetterAndSetter: Int = LAZY_EXPRESSION @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { receive#(withGetterAndSetter#) withGetterAndSetter# = IntegerLiteral(123) @@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { receive#(withGetterAndSetter#) withGetterAndSetter# = IntegerLiteral(123) @@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { receive#(withGetterAndSetter#) withGetterAndSetter# = IntegerLiteral(123) @@ -117,7 +117,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyWithGetterAndSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { R|/receive|(R|/withGetterAndSetter|) R|/withGetterAndSetter| = Int(123) diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt index ff32df6a111..f2f9ef86944 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/propertyWithInitializer.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int IMPORTS: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int TYPES: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int STATUS: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] val property: Int = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): Int CONTRACTS: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { receive#(property#) } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { receive#(property#) } @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { receive#(property#) } @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] propertyWithInitializer.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { #(R|/property|) } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/redeclaration.txt b/analysis/low-level-api-fir/testdata/lazyResolve/redeclaration.txt index 945c058f69d..701ebdc2310 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/redeclaration.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/redeclaration.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -16,7 +16,7 @@ FILE: [ResolvedTo(RAW_FIR)] redeclaration.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -32,7 +32,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt TYPES: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt STATUS: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -128,7 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -192,7 +192,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] redeclaration.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClass.txt index f4e400ffaf0..9bcf35f6530 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/resolveSuperTypeFromLocalClass.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -15,7 +15,7 @@ FILE: [ResolvedTo(RAW_FIR)] resolveSuperTypeFromLocalClass.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -45,7 +45,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -75,7 +75,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt TYPES: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt STATUS: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -135,7 +135,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -158,7 +158,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -181,7 +181,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -204,7 +204,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] resolveSuperTypeFromLocalClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructor.txt b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructor.txt index 36ba997d0b5..a17fe9abf32 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructor.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalClassConstructor.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -19,7 +19,7 @@ FILE: [ResolvedTo(RAW_FIR)] resolveTypeFromLocalClassConstructor.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -38,7 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -76,7 +76,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt TYPES: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -114,7 +114,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt STATUS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -133,7 +133,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -152,7 +152,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -171,7 +171,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -201,7 +201,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -231,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalClassConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunction.txt b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunction.txt index 960aeaadeb7..3db17ab2269 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunction.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/resolveTypeFromLocalFunction.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -19,7 +19,7 @@ FILE: [ResolvedTo(RAW_FIR)] resolveTypeFromLocalFunction.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -38,7 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -76,7 +76,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt TYPES: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -114,7 +114,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt STATUS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -133,7 +133,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -152,7 +152,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -171,7 +171,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -201,7 +201,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -231,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super @@ -261,7 +261,7 @@ FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] resolveTypeFromLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class UnusedClass : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=UnusedClass] constructor(): R|one/two/UnusedClass| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructor.txt b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructor.txt index 0c54808e2d2..69ea44bc3e8 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructor.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructor.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { @@ -10,7 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] secondaryConstructor.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { @@ -20,7 +20,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt TYPES: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt STATUS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: A): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { receive#(A#(IntegerLiteral(42))) } @@ -102,7 +102,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { receive#(A#(IntegerLiteral(42))) } @@ -114,7 +114,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { receive#(A#(IntegerLiteral(42))) } @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { R|/receive|(R|/A.A|(Int(42))) } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameter.txt index 6e8135fa1de..7a44fd07426 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/secondaryConstructorParameter.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION, [ResolvedTo(RAW_FIR)] c: String): R|A| { LAZY_super @@ -20,7 +20,7 @@ FILE: [ResolvedTo(RAW_FIR)] secondaryConstructorParameter.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION, [ResolvedTo(RAW_FIR)] c: String): R|A| { LAZY_super @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION, [ResolvedTo(RAW_FIR)] c: String): R|A| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION, [ResolvedTo(RAW_FIR)] c: String): R|A| { LAZY_super @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/A.prop] prop: Int = LAZY_EXPRESSION, [ResolvedTo(RAW_FIR)] c: String): R|A| { LAZY_super @@ -100,7 +100,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt TYPES: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=A] constructor([ResolvedTo(TYPES)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(TYPES)] c: R|kotlin/String|): R|A| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt STATUS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| { LAZY_super @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| { LAZY_super @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| { LAZY_super @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| { LAZY_super @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| { LAZY_super @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| { LAZY_super @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(STATUS)] c: R|kotlin/String|): R|A| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/superTypes.txt b/analysis/low-level-api-fir/testdata/lazyResolve/superTypes.txt index 82a53f7a126..0bb8d7e75e1 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/superTypes.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/superTypes.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -22,7 +22,7 @@ FILE: [ResolvedTo(RAW_FIR)] superTypes.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -44,7 +44,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -66,7 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt TYPES: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt STATUS: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -154,7 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -176,7 +176,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -242,7 +242,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypes.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] superTypes.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoop.txt b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoop.txt index d7589cac282..eb8bf83da37 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoop.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoop.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class resolveMe : C { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -28,7 +28,7 @@ FILE: [ResolvedTo(RAW_FIR)] superTypesLoop.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(RAW_FIR)] class resolveMe : C { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class resolveMe : C { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(COMPANION_GENERATION)] class resolveMe : C { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(SUPER_TYPES)] class resolveMe : R|C| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt TYPES: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? open [ResolvedTo(TYPES)] class resolveMe : R|C| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -168,7 +168,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt STATUS: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class resolveMe : R|C| { public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -196,7 +196,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class resolveMe : R|C| { public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -224,7 +224,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class resolveMe : R|C| { public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -252,7 +252,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(CONTRACTS)] class resolveMe : R|C| { public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -280,7 +280,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class resolveMe : R|C| { public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -308,7 +308,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class resolveMe : R|C| { public [ResolvedTo(STATUS)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { LAZY_super @@ -336,7 +336,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] superTypesLoop.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(BODY_RESOLVE)] class resolveMe : R|C| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=resolveMe] constructor(): R|resolveMe| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctions.txt b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctions.txt index bfd5b752e23..4288d4ee2cb 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctions.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctions.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { receive#(functionWithLazyBody#()) } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { receive#(functionWithLazyBody#()) } @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { receive#(functionWithLazyBody#()) } @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] topLevelFunctions.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { R|/receive|(R|/functionWithLazyBody|()) } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt index ff91563c9f3..a9d3885fc1e 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithExpressionBodyAndExplicitType.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): String { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { receive#(functionWithLazyBody#()) } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.k IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { receive#(functionWithLazyBody#()) } @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.k ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { receive#(functionWithLazyBody#()) } @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.k BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithExpressionBodyAndExplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { R|/receive|(R|/functionWithLazyBody|()) } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt index 09c7624486a..620a37ecb6e 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/topLevelFunctionsWithImplicitType.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun receive([ResolvedTo(RAW_FIR)] value: String): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] fun functionWithLazyBody(): { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { receive#(functionWithLazyBody#()) } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { receive#(functionWithLazyBody#()) } @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { receive#(functionWithLazyBody#()) } @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] topLevelFunctionsWithImplicitType.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { R|/receive|(R|/functionWithLazyBody|()) } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt index 3b53802cec5..f0dfb4e0cf4 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeAliases/typeAliasWithTypeParameters.txt @@ -1,66 +1,66 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map IMPORTS: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final [ResolvedTo(RAW_FIR)] typealias ResolveMe<[ResolvedTo(RAW_FIR)] T : Int, [ResolvedTo(RAW_FIR)] K> = Map COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] typealias ResolveMe<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] T : Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] K> = Map COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final [ResolvedTo(COMPANION_GENERATION)] typealias ResolveMe<[ResolvedTo(COMPANION_GENERATION)] T : Int, [ResolvedTo(COMPANION_GENERATION)] K> = Map SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final [ResolvedTo(SUPER_TYPES)] typealias ResolveMe<[ResolvedTo(SUPER_TYPES)] T : Int, [ResolvedTo(SUPER_TYPES)] K> = R|kotlin/collections/Map| TYPES: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final [ResolvedTo(TYPES)] typealias ResolveMe<[ResolvedTo(TYPES)] T : R|kotlin/Int|, [ResolvedTo(TYPES)] K> = R|kotlin/collections/Map| STATUS: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] typealias ResolveMe<[ResolvedTo(STATUS)] T : R|kotlin/Int|, [ResolvedTo(STATUS)] K> = R|kotlin/collections/Map| EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] typealias ResolveMe<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] T : R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] K> = R|kotlin/collections/Map| ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] typealias ResolveMe<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] T : R|kotlin/Int|, [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] K> = R|kotlin/collections/Map| CONTRACTS: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] typealias ResolveMe<[ResolvedTo(CONTRACTS)] T : R|kotlin/Int|, [ResolvedTo(CONTRACTS)] K> = R|kotlin/collections/Map| IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] typealias ResolveMe<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] K> = R|kotlin/collections/Map| ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] typealias ResolveMe<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T : R|kotlin/Int|, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] K> = R|kotlin/collections/Map| BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeAliasWithTypeParameters.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] typealias ResolveMe<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] K> = R|kotlin/collections/Map| FILE RAW TO BODY: diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBounds.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBounds.txt index 9d896186ddb..ee25a53bfcb 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBounds.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBounds.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| { } @@ -10,7 +10,7 @@ FILE: [ResolvedTo(RAW_FIR)] typeParameterBounds.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun resolveMe([ResolvedTo(RAW_FIR)] foo: Foo): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| { } @@ -20,7 +20,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] foo: Foo): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| { } @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe([ResolvedTo(COMPANION_GENERATION)] foo: Foo): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| { } @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe([ResolvedTo(SUPER_TYPES)] foo: Foo): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| { } @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun resolveMe([ResolvedTo(TYPES)] foo: R|Foo|): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| { } @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt STATUS: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun resolveMe([ResolvedTo(STATUS)] foo: R|Foo|): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| { } @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe([ResolvedTo(EXPECT_ACTUAL_MATCHING)] foo: R|Foo|): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| { } @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe([ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] foo: R|Foo|): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] interface Foo : R|kotlin/Any| { } @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun resolveMe([ResolvedTo(CONTRACTS)] foo: R|Foo|): R|kotlin/Unit| { foo#.util#() } @@ -102,7 +102,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] foo: R|Foo|): R|kotlin/Unit| { foo#.util#() } @@ -114,7 +114,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] foo: R|Foo|): R|kotlin/Unit| { foo#.util#() } @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterBounds.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe([ResolvedTo(BODY_RESOLVE)] foo: R|Foo|): R|kotlin/Unit| { R|/foo|.R|/util||>() } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass.txt index a6712301a63..eeb242e0836 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfClass.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass| { LAZY_super @@ -12,7 +12,7 @@ FILE: [ResolvedTo(RAW_FIR)] typeParameterOfClass.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class MyClass<[ResolvedTo(RAW_FIR)] Type> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(RAW_FIR)] Type>(): R|MyClass| { LAZY_super @@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] Type> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] Type>(): R|MyClass| { LAZY_super @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass<[ResolvedTo(COMPANION_GENERATION)] Type> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(COMPANION_GENERATION)] Type>(): R|MyClass| { LAZY_super @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class MyClass<[ResolvedTo(SUPER_TYPES)] Type> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(SUPER_TYPES)] Type>(): R|MyClass| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class MyClass<[ResolvedTo(TYPES)] Type> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(TYPES)] Type>(): R|MyClass| { LAZY_super @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt STATUS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class MyClass<[ResolvedTo(STATUS)] Type> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(STATUS)] Type>(): R|MyClass| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type>(): R|MyClass| { LAZY_super @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] class MyClass<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type>(): R|MyClass| { LAZY_super @@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] class MyClass<[ResolvedTo(CONTRACTS)] Type> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(CONTRACTS)] Type>(): R|MyClass| { LAZY_super @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Type> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Type>(): R|MyClass| { LAZY_super @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class MyClass<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Type> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Type>(): R|MyClass| { LAZY_super @@ -144,7 +144,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfClass.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] class MyClass<[ResolvedTo(BODY_RESOLVE)] Type> : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor<[ResolvedTo(BODY_RESOLVE)] Type>(): R|MyClass| { super() diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunction.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunction.txt index d117130c374..23aa949a4fc 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunction.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfNonLocalFunction.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -12,7 +12,7 @@ FILE: [ResolvedTo(RAW_FIR)] typeParameterOfNonLocalFunction.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -60,7 +60,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] class X : R|kotlin/Any| { public? [ResolvedTo(TYPES)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt STATUS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -96,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -108,7 +108,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -121,7 +121,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -134,7 +134,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super @@ -147,7 +147,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfNonLocalFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunction.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunction.txt index 57373834261..5c096af6521 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunction.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopFunction.txt @@ -1,69 +1,69 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] fun <[ResolvedTo(RAW_FIR)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun <[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] fun <[ResolvedTo(COMPANION_GENERATION)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] fun <[ResolvedTo(SUPER_TYPES)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] fun <[ResolvedTo(TYPES)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] fun <[ResolvedTo(STATUS)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] resolveMe> ddd(): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] resolveMe> ddd(): R|kotlin/Unit| { } IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun <[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] resolveMe> ddd(): R|kotlin/Unit| { } ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] resolveMe> ddd(): R|kotlin/Unit| { } BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopFunction.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] resolveMe> ddd(): R|kotlin/Unit| { } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt index 308ed47bc32..a96a5639bad 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTopSetter.txt @@ -1,60 +1,60 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK } IMPORTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] val <[ResolvedTo(RAW_FIR)] Type> Type.x: Int public? [ResolvedTo(RAW_FIR)] get(): Int { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] val <[ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] Type> Type.x: Int public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] get(): Int { LAZY_BLOCK } COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(COMPANION_GENERATION)] val <[ResolvedTo(COMPANION_GENERATION)] Type> Type.x: Int public? [ResolvedTo(COMPANION_GENERATION)] get(): Int { LAZY_BLOCK } SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] val <[ResolvedTo(SUPER_TYPES)] Type> Type.x: Int public? [ResolvedTo(SUPER_TYPES)] get(): Int { LAZY_BLOCK } TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(TYPES)] val <[ResolvedTo(TYPES)] Type> R|Type|.x: R|kotlin/Int| public? [ResolvedTo(TYPES)] get(): R|kotlin/Int| { LAZY_BLOCK } STATUS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] val <[ResolvedTo(STATUS)] Type> R|Type|.x: R|kotlin/Int| public [ResolvedTo(STATUS)] get(): R|kotlin/Int| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] val <[ResolvedTo(EXPECT_ACTUAL_MATCHING)] Type> R|Type|.x: R|kotlin/Int| public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] get(): R|kotlin/Int| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] val <[ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] Type> R|Type|.x: R|kotlin/Int| public [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] get(): R|kotlin/Int| { LAZY_BLOCK } CONTRACTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(CONTRACTS)] val <[ResolvedTo(CONTRACTS)] Type> R|Type|.x: R|kotlin/Int| public [ResolvedTo(CONTRACTS)] get(): R|kotlin/Int| { ^ IntegerLiteral(42) @@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val <[ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] Type> R|Type|.x: R|kotlin/Int| public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| { ^ IntegerLiteral(42) @@ -70,7 +70,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val <[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] Type> R|Type|.x: R|kotlin/Int| public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { ^ IntegerLiteral(42) @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTopSetter.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] val <[ResolvedTo(BODY_RESOLVE)] Type> R|Type|.x: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { ^ Int(42) diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAlias.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAlias.txt index 0d698ccfa6d..df01f744f0b 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAlias.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterOfTypeAlias.txt @@ -1,6 +1,6 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X| { LAZY_super @@ -11,7 +11,7 @@ FILE: [ResolvedTo(RAW_FIR)] typeParameterOfTypeAlias.kt IMPORTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X| { LAZY_super @@ -22,7 +22,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X| { LAZY_super @@ -33,7 +33,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class X<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(RAW_FIR)] T>(): R|X| { LAZY_super @@ -44,7 +44,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt SUPER_TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X| { LAZY_super @@ -55,7 +55,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt TYPES: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X| { LAZY_super @@ -66,7 +66,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt STATUS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X| { LAZY_super @@ -77,7 +77,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X| { LAZY_super @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt ARGUMENTS_OF_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X| { LAZY_super @@ -99,7 +99,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X| { LAZY_super @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X| { LAZY_super @@ -121,7 +121,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X| { LAZY_super @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeParameterOfTypeAlias.kt - [ResolvedTo(RAW_FIR)] annotations container + [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(SUPER_TYPES)] class X<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|X| { LAZY_super diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt index da85d9f151c..b226f77a273 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt @@ -120,11 +120,12 @@ class DeclarationsConverter( this.sourceFile = sourceFile this.sourceFileLinesMapping = linesMapping this.packageDirective = packageDirective ?: buildPackageDirective { packageFqName = context.packageFqName } - annotationsContainer = fileAnnotationContainer - ?: buildFileAnnotationsContainer { - moduleData = baseModuleData - containingFileSymbol = fileSymbol - } + annotationsContainer = fileAnnotationContainer ?: buildFileAnnotationsContainer { + moduleData = baseModuleData + containingFileSymbol = fileSymbol + resolvePhase = FirResolvePhase.BODY_RESOLVE + } + imports += importList declarations += firDeclarationList } @@ -329,6 +330,10 @@ class DeclarationsConverter( ANNOTATION_ENTRY -> container += convertAnnotationEntry(node) } } + + annotations.ifEmpty { + resolvePhase = FirResolvePhase.BODY_RESOLVE + } } } diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index be27a37aab7..cb759192797 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -1049,6 +1049,10 @@ open class RawFirBuilder( for (annotationEntry in file.annotationEntries) { annotations += annotationEntry.convert() } + + annotations.ifEmpty { + resolvePhase = FirResolvePhase.BODY_RESOLVE + } } for (importDirective in file.importDirectives) {