From 5183019cb8890f76209127549e5b08871acd29a0 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 22 Nov 2023 12:21:47 +0100 Subject: [PATCH] [LL FIR] resolve class before constructor This is required to have stable resolution order to avoid concurrent modifications and correct resolution context. This also fixes KT-63700 as a super call expands only during body resolution in the case of secondary constructor ^KT-63042 ^KT-63700 Fixed --- .../fir/transformers/LLFirTargetResolver.kt | 4 +- .../classHeaderPositions/contextReceiver.txt | 4 +- ...tructorParameter_initializerExpression.txt | 8 +- .../primaryConstructorParameter_typeRef.txt | 8 +- .../superTypeCallArgumentsExpression.txt | 2 +- .../superTypeCallArgumentsTypeRef.txt | 2 +- .../classHeaderPositions/superTypeCallee.txt | 4 +- .../superTypeCalleeGenerics.txt | 4 +- .../classHeaderPositions/superTypeRef.txt | 4 +- .../superTypeRefGenerics.txt | 4 +- .../testData/contextCollector/file.txt | 4 +- .../primaryConstructorParameter.txt | 4 +- .../contextCollector/scripts/topLevel.txt | 2 +- .../declaredInClass_fromContextReceiver.txt | 6 +- .../declaredInClass_fromInner_typeBound.txt | 8 +- ...laredInClass_fromInner_typeRefInMember.txt | 6 +- .../declaredInClass_fromNested_typeBound.txt | 8 +- ...aredInClass_fromNested_typeRefInMember.txt | 6 +- .../declaredInClass_fromSuperType.txt | 6 +- .../declaredInClass_fromTypeBound.txt | 6 +- .../annotationOnConstructorProperty.txt | 2 +- ...OnConstructorProperty.out_of_src_roots.txt | 2 +- ...vmFieldAnnotationOnConstructorProperty.txt | 2 +- ...typeOnAnnotationOnConstructorParameter.txt | 2 +- ...tationOnConstructorParameterExpression.txt | 2 +- ...OnConstructorParameterExpressionScript.txt | 2 +- ...AnnotationOnConstructorParameterScript.txt | 2 +- .../typeOnAnnotationOnConstructorProperty.txt | 2 +- ...ationOnConstructorPropertyAndParameter.txt | 2 +- ...nAnnotationOnConstructorPropertyScript.txt | 2 +- ...tionOnConstructorPropertyWithArguments.txt | 2 +- ...ConstructorPropertyWithArgumentsScript.txt | 2 +- .../annotations/useSite/field.txt | 2 +- .../annotations/useSite/fieldScript.txt | 2 +- .../annotations/useSite/getter.txt | 2 +- .../annotations/useSite/getterScript.txt | 2 +- .../annotations/useSite/param.txt | 2 +- .../annotations/useSite/paramScript.txt | 2 +- .../annotations/useSite/property.txt | 2 +- .../annotations/useSite/propertyScript.txt | 2 +- .../annotations/useSite/setParam.txt | 2 +- .../annotations/useSite/setParamScript.txt | 2 +- .../annotations/useSite/setter.txt | 2 +- .../annotations/useSite/setterScript.txt | 2 +- ...aInsideSuperCallAndExplicitConstructor.txt | 2 +- ...eSuperCallAndExplicitConstructorScript.txt | 4 +- ...nsideSuperCallFromSecondaryConstructor.txt | 4 +- ...uperCallFromSingleSecondaryConstructor.txt | 4 +- .../calls/constructorDelegationThisCall.txt | 4 +- ...iedCallInsidePropertyInsideConstructor.txt | 4 +- .../calls/qualifiedCallInsideSuperCall3.txt | 4 +- .../calls/qualifiedCallInsideSuperCall5.txt | 4 +- .../declarations/constructorParameter.txt | 4 +- .../constructorParameterScript.txt | 4 +- .../declarations/constructorProperty.txt | 4 +- .../constructorPropertyScript.txt | 4 +- .../destructuringDeclaration.txt | 2 +- .../destructuringDeclarationInLambda.txt | 2 +- ...tructuringDeclarationParameterInLambda.txt | 2 +- .../entryInDestructuringDeclaration.txt | 2 +- ...tructuringDeclarationParameterInLambda.txt | 2 +- ...ryUnderscoreInDestructuringDeclaration.txt | 2 +- ...tructuringDeclarationParameterInLambda.txt | 2 +- .../primaryConstructorValValueParameter.txt | 4 +- .../primaryConstructorValueParameter.txt | 4 +- ...primaryConstructorValueParameterScript.txt | 4 +- .../secondaryConstructorValueParameter.txt | 4 +- ...condaryConstructorValueParameterScript.txt | 4 +- .../dataClass/component1TypeCollision.txt | 14 +- .../component1TypeCollisionScript.txt | 14 +- .../classes/dataClass/copyTypeCollision.txt | 14 +- .../dataClass/copyTypeCollisionScript.txt | 14 +- .../dataClass/parameterTypeCollision.txt | 14 +- .../parameterTypeCollisionScript.txt | 15 +- .../dataClass/propertyTypeCollision.txt | 14 +- .../dataClass/propertyTypeCollisionScript.txt | 14 +- ...mpilerRequiredAnnotationsOnConstructor.txt | 14 +- ...quiredAnnotationsOnConstructorProperty.txt | 14 +- ...AnnotationsOnConstructorPropertyScript.txt | 14 +- ...RequiredAnnotationsOnConstructorScript.txt | 15 +- .../lazyResolve/complexRedeclaration.txt | 14 +- .../complexRedeclarationScript.txt | 15 +- .../testData/lazyResolve/dataClassCopy.txt | 14 +- .../lazyResolve/dataClassCopyScript.txt | 14 +- .../testData/lazyResolve/dataComponent2.txt | 14 +- .../lazyResolve/dataComponent2Script.txt | 14 +- .../lazyResolve/fakePrimaryConstructor.txt | 14 +- .../fakePrimaryConstructorScript.txt | 15 +- .../functions/superTypeCallNameClash.txt | 14 +- ...erTypeCallNameClashImplicitConstructor.txt | 14 +- ...CallNameClashImplicitConstructorScript.txt | 14 +- .../superTypeCallNameClashScript.txt | 14 +- .../superTypeCallNestedNameClash.txt | 14 +- ...CallNestedNameClashImplicitConstructor.txt | 14 +- ...stedNameClashImplicitConstructorScript.txt | 14 +- .../superTypeCallNestedNameClashScript.txt | 14 +- .../lazyResolve/primaryConstructor.txt | 14 +- .../primaryConstructorParameter.txt | 14 +- .../primaryConstructorParameterScript.txt | 15 +- .../primaryConstructorProperty.txt | 14 +- .../primaryConstructorPropertyScript.txt | 15 +- .../lazyResolve/primaryConstructorScript.txt | 15 +- .../properties/constructorParameter.txt | 14 +- ...rameterWithImplicitParameterAnnotation.txt | 14 +- .../generatedPropertyFromParameter.txt | 14 +- ...rtyFromParameterWithImplicitAnnotation.txt | 14 +- .../testData/lazyResolve/redeclaration.txt | 14 +- .../lazyResolve/redeclarationScript.txt | 15 +- .../secondaryConstructorParameter.txt | 14 +- .../secondaryConstructorParameterScript.txt | 15 +- .../substitutionFakeOverrideConstructor.txt | 14 +- ...stitutionFakeOverrideConstructorScript.txt | 15 +- .../typeAliasWithAnnotationOnType.txt | 4 +- ...meterTypeCollisionAndAnnotations.after.txt | 2 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 14 +- ...ypeCollisionAndAnnotationsScript.after.txt | 2 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 14 +- .../constructor/call.before.txt | 2 +- .../constructor/call.lazyResolve.txt | 28 +- .../constructor/callScript.before.txt | 2 +- .../constructor/callScript.lazyResolve.txt | 28 +- .../callWithConstructor.before.txt | 2 +- .../callWithConstructor.lazyResolve.txt | 28 +- .../callWithConstructorScript.before.txt | 2 +- .../callWithConstructorScript.lazyResolve.txt | 28 +- .../constructor/reference.after.txt | 14 +- .../constructor/reference.before.txt | 14 +- .../constructor/reference.lazyResolve.txt | 38 +- .../constructor/referenceScript.after.txt | 14 +- .../constructor/referenceScript.before.txt | 14 +- .../referenceScript.lazyResolve.txt | 38 +- .../referenceWithConstructor.after.txt | 14 +- .../referenceWithConstructor.before.txt | 14 +- .../referenceWithConstructor.lazyResolve.txt | 38 +- .../referenceWithConstructorScript.after.txt | 14 +- .../referenceWithConstructorScript.before.txt | 14 +- ...renceWithConstructorScript.lazyResolve.txt | 38 +- .../secondaryConstructor.after.txt | 36 ++ .../secondaryConstructor.before.txt | 36 ++ .../constructor/secondaryConstructor.kt | 15 + .../secondaryConstructor.lazyResolve.txt | 321 +++++++++++++ .../secondaryConstructorScript.after.txt | 43 ++ .../secondaryConstructorScript.before.txt | 43 ++ .../secondaryConstructorScript.kts | 15 + ...secondaryConstructorScript.lazyResolve.txt | 424 ++++++++++++++++++ ...nent1TypeCollisionAndAnnotations.after.txt | 2 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 14 +- ...ypeCollisionAndAnnotationsScript.after.txt | 2 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 15 +- .../copyTypeCollisionAndAnnotations.after.txt | 2 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 14 +- ...ypeCollisionAndAnnotationsScript.after.txt | 2 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 15 +- ...ClashAndAnnotationsAsConstructor.after.txt | 8 +- ...ndAnnotationsAsConstructor.lazyResolve.txt | 26 +- ...ndAnnotationsAsConstructorScript.after.txt | 8 +- ...tationsAsConstructorScript.lazyResolve.txt | 26 +- ...TypesAndAnnotationsAsConstructor.after.txt | 8 +- ...ndAnnotationsAsConstructor.lazyResolve.txt | 26 +- ...ndAnnotationsAsConstructorScript.after.txt | 8 +- ...tationsAsConstructorScript.lazyResolve.txt | 26 +- .../function/generatedComponentN.after.txt | 2 +- .../generatedComponentN.lazyResolve.txt | 14 +- .../generatedComponentNScript.after.txt | 2 +- .../generatedComponentNScript.lazyResolve.txt | 14 +- .../function/generatedCopy.after.txt | 2 +- .../function/generatedCopy.lazyResolve.txt | 14 +- .../function/generatedCopyScript.after.txt | 2 +- .../generatedCopyScript.lazyResolve.txt | 14 +- ...allNameClashWithAnnotation.lazyResolve.txt | 38 +- ...otationImplicitConstructor.lazyResolve.txt | 38 +- ...nImplicitConstructorScript.lazyResolve.txt | 39 +- ...eClashWithAnnotationScript.lazyResolve.txt | 39 +- ...tedNameClashWithAnnotation.lazyResolve.txt | 38 +- ...otationImplicitConstructor.lazyResolve.txt | 38 +- ...nImplicitConstructorScript.lazyResolve.txt | 39 +- ...eClashWithAnnotationScript.lazyResolve.txt | 39 +- .../property/constructorParameter.after.txt | 2 +- .../constructorParameter.lazyResolve.txt | 14 +- .../constructorParameterScript.after.txt | 3 +- ...constructorParameterScript.lazyResolve.txt | 15 +- ...generatedPropertyFromConstructor.after.txt | 2 +- ...tedPropertyFromConstructor.lazyResolve.txt | 14 +- ...tedPropertyFromConstructorScript.after.txt | 2 +- ...pertyFromConstructorScript.lazyResolve.txt | 15 +- ...pertyTypeCollisionAndAnnotations.after.txt | 2 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 14 +- ...ypeCollisionAndAnnotationsScript.after.txt | 2 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 14 +- .../constructor.lazyResolve.txt | 32 +- .../constructorCallSite.after.txt | 6 +- .../constructorCallSite.before.txt | 6 +- .../constructorCallSite.lazyResolve.txt | 6 +- .../constructorCallSiteScript.after.txt | 6 +- .../constructorCallSiteScript.before.txt | 6 +- .../constructorCallSiteScript.lazyResolve.txt | 6 +- .../constructorScript.lazyResolve.txt | 32 +- .../typeAlias/withMissedArguments.after.txt | 2 +- .../withMissedArguments.lazyResolve.txt | 4 +- .../withMissedArgumentsScript.after.txt | 3 +- .../withMissedArgumentsScript.lazyResolve.txt | 5 +- ...esolveForTypeAnnotationsTestGenerated.java | 6 + ...tRootLazyTypeAnnotationsTestGenerated.java | 6 + ...esolveForTypeAnnotationsTestGenerated.java | 6 + ...criptLazyTypeAnnotationsTestGenerated.java | 6 + ...esolveForTypeAnnotationsTestGenerated.java | 6 + ...ourceLazyTypeAnnotationsTestGenerated.java | 6 + 207 files changed, 2011 insertions(+), 1019 deletions(-) create mode 100644 analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.after.txt create mode 100644 analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.before.txt create mode 100644 analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.kt create mode 100644 analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.lazyResolve.txt create mode 100644 analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructorScript.after.txt create mode 100644 analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructorScript.before.txt create mode 100644 analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructorScript.kts create mode 100644 analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructorScript.lazyResolve.txt diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt index f96ccfc88bf..5c8c550bb24 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration +import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirField import org.jetbrains.kotlin.fir.declarations.FirFile @@ -86,7 +87,8 @@ internal abstract class LLFirTargetResolver( } // delegate field shares the return type with the containing class - target is FirField && target.origin == FirDeclarationOrigin.Synthetic.DelegateField -> { + // constructor shares types inside delegation call with the containing class + target is FirField && target.origin == FirDeclarationOrigin.Synthetic.DelegateField || target is FirConstructor -> { containingClass(target).lazyResolveToPhase(resolverPhase) } } diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt index 31a9851218a..a506525c331 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt @@ -29,9 +29,9 @@ FILE: [ResolvedTo(IMPORTS)] contextReceiver.kt } context(R|test/Base|) - public final [ResolvedTo(STATUS)] class Child : R|test/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Child| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_initializerExpression.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_initializerExpression.txt index f1ad0132dd4..7737efdf6b5 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_initializerExpression.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_initializerExpression.txt @@ -24,12 +24,12 @@ Tower Data Context: FirValueParameterSymbol name: R|kotlin/String| = String(name) FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter_initializerExpression.kt - public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| { + public open [ResolvedTo(ANNOTATION_ARGUMENTS)] class Base : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Base| { super() } - public final [ResolvedTo(STATUS)] class Nested : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Nested : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Base.Nested| { super() } @@ -40,9 +40,9 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter_initializerExpression.kt public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| } - public final [ResolvedTo(STATUS)] class Child : R|test/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base| { public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/String| = String(name)): R|test/Child| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_typeRef.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_typeRef.txt index bae41ffa503..5f659276018 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_typeRef.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/primaryConstructorParameter_typeRef.txt @@ -24,12 +24,12 @@ Tower Data Context: FirValueParameterSymbol name: R|kotlin/String| FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter_typeRef.kt - public open [ResolvedTo(STATUS)] class Base : R|kotlin/Any| { + public open [ResolvedTo(ANNOTATION_ARGUMENTS)] class Base : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Base| { super() } - public final [ResolvedTo(STATUS)] class Nested : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Nested : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Base.Nested| { super() } @@ -37,9 +37,9 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter_typeRef.kt } } - public final [ResolvedTo(STATUS)] class Child : R|test/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base| { public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/String|): R|test/Child| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsExpression.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsExpression.txt index e107889224b..0992648f676 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsExpression.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsExpression.txt @@ -37,7 +37,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallArgumentsExpression.kt } } - public final [ResolvedTo(STATUS)] class Child : R|test/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base| { public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] primaryConstructorParameter: R|test/Base.Nested|): R|test/Child| { super(R|/primaryConstructorParameter|) } diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsTypeRef.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsTypeRef.txt index 5b4945b8c24..c0830df87e7 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsTypeRef.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallArgumentsTypeRef.txt @@ -40,7 +40,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallArgumentsTypeRef.kt public final [ResolvedTo(CONTRACTS)] fun <[ResolvedTo(CONTRACTS)] T> materialize(): R|T| { ^materialize TODO#() } - public final [ResolvedTo(STATUS)] class Child : R|test/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base| { public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] primaryConstructorParameter: R|test/Base.Nested|): R|test/Child| { super(R|test/materialize|()) } diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt index 80bd4b11966..351c01f2389 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt @@ -28,9 +28,9 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallee.kt } } - public final [ResolvedTo(STATUS)] class Child : R|test/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Child| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt index e0aff489872..c3c4f153e69 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt @@ -28,9 +28,9 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCalleeGenerics.kt } } - public final [ResolvedTo(STATUS)] class Child : R|test/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Child| { super|>() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt index 327392f872f..91602251120 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt @@ -28,9 +28,9 @@ FILE: [ResolvedTo(IMPORTS)] superTypeRef.kt } } - public final [ResolvedTo(STATUS)] class Child : R|test/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Child| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt index ae642bad86f..3278b696485 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt @@ -28,9 +28,9 @@ FILE: [ResolvedTo(IMPORTS)] superTypeRefGenerics.kt } } - public final [ResolvedTo(STATUS)] class Child : R|test/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Child| { super|>() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/file.txt b/analysis/low-level-api-fir/testData/contextCollector/file.txt index fdaa5dc853c..5b2b05bed89 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/file.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/file.txt @@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] file.kt public final [ResolvedTo(BODY_RESOLVE)] fun other(): R|kotlin/Int| { ^other String(foo).R|kotlin/String.length| } - public final [ResolvedTo(STATUS)] class Foo : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Foo : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Foo| { super() } @@ -33,4 +33,4 @@ FILE: [ResolvedTo(IMPORTS)] file.kt #(==(R|test/other|(), Int(3))) } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/primaryConstructorParameter.txt b/analysis/low-level-api-fir/testData/contextCollector/primaryConstructorParameter.txt index 794c497b1fb..442b618358d 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/primaryConstructorParameter.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/primaryConstructorParameter.txt @@ -19,7 +19,7 @@ Tower Data Context: Type: Foo FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class Foo : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Foo : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] a: R|kotlin/String| = LAZY_EXPRESSION, [ResolvedTo(ANNOTATION_ARGUMENTS)] b: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(ANNOTATION_ARGUMENTS)] c: R|kotlin/Long| = LAZY_EXPRESSION): R|Foo| { LAZY_super } @@ -33,4 +33,4 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt public final [ResolvedTo(STATUS)] val c: R|kotlin/Long| = R|/c| public [ResolvedTo(STATUS)] get(): R|kotlin/Long| - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.txt b/analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.txt index 5a78d92798f..9e9bd0ef7b8 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/scripts/topLevel.txt @@ -65,7 +65,7 @@ FILE: [ResolvedTo(IMPORTS)] topLevel.kts public final [ResolvedTo(BODY_RESOLVE)] val before_Val: R|kotlin/Int| = Int(10) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public final [ResolvedTo(STATUS)] class Before_OtherClass : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Before_OtherClass : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Before_OtherClass| { super() } diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromContextReceiver.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromContextReceiver.txt index fa2ef567cde..894a7ee4ac8 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromContextReceiver.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromContextReceiver.txt @@ -20,9 +20,9 @@ Tower Data Context: FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromContextReceiver.kt context(R|MyParam|) - public final [ResolvedTo(STATUS)] class Outer<[ResolvedTo(STATUS)] MyParam> : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(STATUS)] MyParam>(): R|test/Outer| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Outer<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam> : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam>(): R|test/Outer| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeBound.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeBound.txt index fc25fba10dd..d4803e7606f 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeBound.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeBound.txt @@ -31,13 +31,13 @@ Tower Data Context: FirTypeParameterSymbol T : R|MyParam| FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromInner_typeBound.kt - public final [ResolvedTo(STATUS)] class Outer<[ResolvedTo(STATUS)] MyParam> : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(STATUS)] MyParam>(): R|test/Outer| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Outer<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam> : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam>(): R|test/Outer| { super() } - public final inner [ResolvedTo(STATUS)] class Inner<[ResolvedTo(STATUS)] T : R|MyParam|, [ResolvedTo(STATUS)] Outer(MyParam)> : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] test/Outer.constructor<[ResolvedTo(STATUS)] T : R|MyParam|>(): R|test/Outer.Inner| { + public final inner [ResolvedTo(ANNOTATION_ARGUMENTS)] class Inner<[ResolvedTo(ANNOTATION_ARGUMENTS)] T : R|MyParam|, [ResolvedTo(ANNOTATION_ARGUMENTS)] Outer(MyParam)> : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] test/Outer.constructor<[ResolvedTo(ANNOTATION_ARGUMENTS)] T : R|MyParam|>(): R|test/Outer.Inner| { super() } diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeRefInMember.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeRefInMember.txt index 2ee306beee2..3515a283f6e 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeRefInMember.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromInner_typeRefInMember.txt @@ -37,12 +37,12 @@ Tower Data Context: FirValueParameterSymbol p: R|MyParam| FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromInner_typeRefInMember.kt - public final [ResolvedTo(STATUS)] class Outer<[ResolvedTo(STATUS)] MyParam> : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(STATUS)] MyParam>(): R|test/Outer| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Outer<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam> : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam>(): R|test/Outer| { super() } - public final inner [ResolvedTo(STATUS)] class Inner<[ResolvedTo(STATUS)] Outer(MyParam)> : R|kotlin/Any| { + public final inner [ResolvedTo(ANNOTATION_ARGUMENTS)] class Inner<[ResolvedTo(ANNOTATION_ARGUMENTS)] Outer(MyParam)> : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] test/Outer.constructor(): R|test/Outer.Inner| { super() } diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeBound.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeBound.txt index 69fc2ccc2f9..7567aa94b68 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeBound.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeBound.txt @@ -31,13 +31,13 @@ Tower Data Context: FirTypeParameterSymbol T : FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromNested_typeBound.kt - public final [ResolvedTo(STATUS)] class Outer<[ResolvedTo(STATUS)] MyParam> : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(STATUS)] MyParam>(): R|test/Outer| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Outer<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam> : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam>(): R|test/Outer| { super() } - public final [ResolvedTo(STATUS)] class Nested<[ResolvedTo(STATUS)] T : > : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(STATUS)] T : >(): R|test/Outer.Nested| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Nested<[ResolvedTo(ANNOTATION_ARGUMENTS)] T : > : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(ANNOTATION_ARGUMENTS)] T : >(): R|test/Outer.Nested| { super() } diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeRefInMember.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeRefInMember.txt index 490dbb9ed08..1fdb6f5d0b7 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeRefInMember.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromNested_typeRefInMember.txt @@ -27,12 +27,12 @@ Tower Data Context: FirValueParameterSymbol p: FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromNested_typeRefInMember.kt - public final [ResolvedTo(STATUS)] class Outer<[ResolvedTo(STATUS)] MyParam> : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(STATUS)] MyParam>(): R|test/Outer| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Outer<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam> : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam>(): R|test/Outer| { super() } - public final [ResolvedTo(STATUS)] class Nested : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Nested : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Outer.Nested| { super() } diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromSuperType.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromSuperType.txt index 74c6bc69e6e..718957df1b2 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromSuperType.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromSuperType.txt @@ -25,9 +25,9 @@ FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromSuperType.kt } } - public final [ResolvedTo(STATUS)] class Outer<[ResolvedTo(STATUS)] MyParam> : R|test/Base| { - public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(STATUS)] MyParam>(): R|test/Outer| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Outer<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam> : R|test/Base| { + public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam>(): R|test/Outer| { super|>() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromTypeBound.txt b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromTypeBound.txt index 71f0cd96e18..755f0ac1e01 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromTypeBound.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/typeParameters/declaredInClass_fromTypeBound.txt @@ -20,9 +20,9 @@ Tower Data Context: FirTypeParameterSymbol Other : R|MyParam| FILE: [ResolvedTo(IMPORTS)] declaredInClass_fromTypeBound.kt - public final [ResolvedTo(STATUS)] class Outer<[ResolvedTo(STATUS)] MyParam, [ResolvedTo(STATUS)] Other : R|MyParam|> : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(STATUS)] MyParam, [ResolvedTo(STATUS)] Other : R|MyParam|>(): R|test/Outer| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Outer<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam, [ResolvedTo(ANNOTATION_ARGUMENTS)] Other : R|MyParam|> : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(ANNOTATION_ARGUMENTS)] MyParam, [ResolvedTo(ANNOTATION_ARGUMENTS)] Other : R|MyParam|>(): R|test/Outer| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnConstructorProperty.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnConstructorProperty.txt index 111d11fb6c8..ca867c2fdb9 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnConstructorProperty.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationOnConstructorProperty.kt - public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Abc : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Abc] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/Abc.i] @[Types]() i: R|kotlin/Int|): R|Abc| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.out_of_src_roots.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.out_of_src_roots.txt index 0a0acbc61f0..9f738c6f6d3 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.out_of_src_roots.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.out_of_src_roots.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt - public final [ResolvedTo(STATUS)] class MyClass : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|A| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/MyClass.addCommaWarning] @[Types]() addCommaWarning: R|kotlin/Boolean| = LAZY_EXPRESSION): R|MyClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt index 9371a465064..d0aa2088e0b 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt - public final [ResolvedTo(STATUS)] class MyClass : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|A| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/MyClass.addCommaWarning] addCommaWarning: R|kotlin/Boolean| = LAZY_EXPRESSION): R|MyClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt index ba63e2aa892..b4d9ba45f7c 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameter.kt - public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class ResolveMe : R|A| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt index b8f894e6bb1..90025d1df45 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt @@ -7,7 +7,7 @@ String(abc) FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpression.kt - public final [ResolvedTo(STATUS)] class ResolveMe : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class ResolveMe : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt index efa75541925..6a7e9a05ff5 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpressionScri SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class ResolveMe : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class ResolveMe : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt index 2cc69713a03..c0c11ea124b 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class ResolveMe : R|A| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt index 59617b1cee8..9e88335eadd 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorProperty.kt - public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class ResolveMe : R|A| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt index d55f9042031..8678a43a49a 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyAndParameter.kt - public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class ResolveMe : R|A| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION, [ResolvedTo(ANNOTATION_ARGUMENTS)] second: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt index c8eb6ea7d6d..9524e76cbc5 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class ResolveMe : R|A| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt index 40ebbea41fe..221dc62af02 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyWithArguments.kt - public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class ResolveMe : R|A| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt index 01627bc964b..298c41e63da 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyWithArgumentsSc SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class ResolveMe : R|A| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/field.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/field.txt index 8320612455b..f91a42f0592 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/field.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/field.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] field.kt } } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/fieldScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/fieldScript.txt index f0b80a7751f..738cc9bd152 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/fieldScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/fieldScript.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getter.txt index 699c6d459ef..a828081ad44 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getter.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] getter.kt } } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getterScript.txt index 1f95d5721f1..ef4f7880a4b 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getterScript.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] getterScript.kts } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/param.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/param.txt index 1fe00b9ca26..658fdc5dbdd 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/param.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/param.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] param.kt } } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] @CONSTRUCTOR_PARAMETER:R|Ann|[Types]() x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/paramScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/paramScript.txt index 05578553d4d..62de16b3186 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/paramScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/paramScript.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] paramScript.kts } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] @CONSTRUCTOR_PARAMETER:R|Ann|[Types]() x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/property.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/property.txt index cec31f016d5..c10179f04e3 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/property.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/property.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] property.kt } } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/propertyScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/propertyScript.txt index 459ee41819b..5acc4759773 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/propertyScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/propertyScript.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyScript.kts } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParam.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParam.txt index 76ea4e93d73..ffe1ed89cae 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParam.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParam.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] setParam.kt } } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParamScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParamScript.txt index f964000cf8e..23693d4bb50 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParamScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParamScript.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] setParamScript.kts } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setter.txt index fa960227685..d7c942305d7 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setter.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] setter.kt } } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setterScript.txt index 1d382f4d52e..728650ee43a 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setterScript.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] setterScript.kts } - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructor.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructor.txt index 599f6220cf1..3b605ee4c21 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructor.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructor.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallAndExplicitConstructo } } - public final [ResolvedTo(STATUS)] class A : R|B| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|B| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/A.f] f: R|kotlin/String| = (Int(42))): R|A| { super(Int(1), [ResolvedTo(RAW_FIR)] fun (): R|kotlin/Unit| { R|/foo|() diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt index 391b7caa101..a15cd7ac441 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallAndExplicitConstructo } - public final [ResolvedTo(STATUS)] class A : R|B| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|B| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| { super(Int(1), [ResolvedTo(RAW_FIR)] fun (): R|kotlin/Unit| { R|/foo|() @@ -29,4 +29,4 @@ FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallAndExplicitConstructo } public final [ResolvedTo(CONTRACTS)] fun foo(): R|kotlin/Unit| { - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSecondaryConstructor.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSecondaryConstructor.txt index 48a69dc3161..617c68c578b 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSecondaryConstructor.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSecondaryConstructor.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallFromSecondaryConstruc } } - public final [ResolvedTo(STATUS)] class B : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class B : R|A| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|B| { LAZY_super<> } @@ -27,4 +27,4 @@ FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallFromSecondaryConstruc } public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] any: R|kotlin/Any|): R|kotlin/Unit| { - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSingleSecondaryConstructor.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSingleSecondaryConstructor.txt index 3ad6dccc576..4a4fdc1f3cc 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSingleSecondaryConstructor.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSingleSecondaryConstructor.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallFromSingleSecondaryCo } } - public final [ResolvedTo(STATUS)] class B : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class B : R|A| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=B] constructor([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int|): R|B| { super([ResolvedTo(RAW_FIR)] fun (): R|kotlin/Unit| { R|/foo|(R|/i|) @@ -23,4 +23,4 @@ FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallFromSingleSecondaryCo } public final [ResolvedTo(CONTRACTS)] fun foo([ResolvedTo(CONTRACTS)] any: R|kotlin/Any|): R|kotlin/Unit| { - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/constructorDelegationThisCall.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/constructorDelegationThisCall.txt index 33fb5775a30..f5474a59791 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/constructorDelegationThisCall.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/constructorDelegationThisCall.txt @@ -7,7 +7,7 @@ this(Int(1)) FIR FILE: FILE: [ResolvedTo(IMPORTS)] constructorDelegationThisCall.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| { LAZY_super } @@ -16,4 +16,4 @@ FILE: [ResolvedTo(IMPORTS)] constructorDelegationThisCall.kt this(Int(1)) } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsidePropertyInsideConstructor.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsidePropertyInsideConstructor.txt index 797f2e69bc2..9e7d90a2548 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsidePropertyInsideConstructor.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsidePropertyInsideConstructor.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsidePropertyInsideConstructor.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/A.i] i: R|() -> kotlin/Unit| = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/Unit| { local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| { ^foo #.#.R|kotlin/toString|() @@ -21,4 +21,4 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsidePropertyInsideConstructor.kt public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|() -> kotlin/Unit| = R|/i| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|() -> kotlin/Unit| - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsideSuperCall3.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsideSuperCall3.txt index b9ba500fb98..bf3a96ee029 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsideSuperCall3.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsideSuperCall3.txt @@ -7,7 +7,7 @@ R|/A.prop| FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall3.kt - public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public open [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class A : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] init: R|A.() -> kotlin/Unit|): R|A| { LAZY_super } @@ -37,4 +37,4 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall3.kt super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsideSuperCall5.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsideSuperCall5.txt index 0571936cc49..2966dded0bc 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsideSuperCall5.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/qualifiedCallInsideSuperCall5.txt @@ -28,7 +28,7 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall5.kt } } - public final [ResolvedTo(STATUS)] class G : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class G : R|A| { public [ResolvedTo(STATUS)] [ContainingClassKey=G] error_constructor(): R|G| { LAZY_super } @@ -43,4 +43,4 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall5.kt ) } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameter.txt index 4841b83601f..a4314b0d270 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameter.txt @@ -7,9 +7,9 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] resolveMe: R|kotlin/Int| = Int(5)): R|X| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameterScript.txt index 049ce554ba9..a92f8390e21 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorParameterScript.txt @@ -11,9 +11,9 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] resolveMe: R|kotlin/Int| = Int(5)): R|X| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorProperty.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorProperty.txt index acc52637e18..3a1be954070 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorProperty.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] constructorProperty.kt - public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Abc : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Abc.i] i: R|kotlin/Int| = Int(4)): R|Abc| { super() } @@ -15,4 +15,4 @@ FILE: [ResolvedTo(IMPORTS)] constructorProperty.kt public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|/i| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] get(): R|kotlin/Int| - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorPropertyScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorPropertyScript.txt index 689545ce646..e5fa4fd745c 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorPropertyScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/declarations/constructorPropertyScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorPropertyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Abc : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Abc.i] i: R|kotlin/Int| = Int(4)): R|Abc| { super() } @@ -19,4 +19,4 @@ FILE: [ResolvedTo(IMPORTS)] constructorPropertyScript.kts public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|/i| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] get(): R|kotlin/Int| - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclaration.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclaration.txt index fd5b788841d..e917176f461 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclaration.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclaration.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] destructuringDeclaration.kt - public final data [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class X : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=X] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.a] a: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.b] b: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclarationInLambda.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclarationInLambda.txt index 38ee81971a7..af938625237 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclarationInLambda.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclarationInLambda.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] destructuringDeclarationInLambda.kt - public final data [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class X : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=X] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.a] a: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.b] b: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclarationParameterInLambda.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclarationParameterInLambda.txt index 69f57778871..46c912c32f8 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclarationParameterInLambda.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/destructuringDeclarationParameterInLambda.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] destructuringDeclarationParameterInLambda.kt - public final data [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class X : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=X] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.a] a: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.b] b: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryInDestructuringDeclaration.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryInDestructuringDeclaration.txt index 8899a749fdf..fe7d6f58f83 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryInDestructuringDeclaration.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryInDestructuringDeclaration.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] entryInDestructuringDeclaration.kt - public final data [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class X : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=X] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.a] a: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.b] b: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryInDestructuringDeclarationParameterInLambda.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryInDestructuringDeclarationParameterInLambda.txt index ae7050bf4a4..70800cf01bf 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryInDestructuringDeclarationParameterInLambda.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryInDestructuringDeclarationParameterInLambda.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] entryInDestructuringDeclarationParameterInLambda.kt - public final data [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class X : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=X] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.a] a: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.b] b: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryUnderscoreInDestructuringDeclaration.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryUnderscoreInDestructuringDeclaration.txt index da9dc1b7d08..17a48b6a8f5 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryUnderscoreInDestructuringDeclaration.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryUnderscoreInDestructuringDeclaration.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] entryUnderscoreInDestructuringDeclaration.kt - public final data [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class X : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=X] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.a] a: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.b] b: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryUnderscoreInDestructuringDeclarationParameterInLambda.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryUnderscoreInDestructuringDeclarationParameterInLambda.txt index ffd8a1416da..9c2f6601b84 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryUnderscoreInDestructuringDeclarationParameterInLambda.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/destructuring/entryUnderscoreInDestructuringDeclarationParameterInLambda.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] entryUnderscoreInDestructuringDeclarationParameterInLambda.kt - public final data [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class X : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=X] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.a] a: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=/X.b] b: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt index 2ed336a1f60..50036651997 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorValValueParameter.kt - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { super() } @@ -15,4 +15,4 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorValValueParameter.kt public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val x: R|kotlin/Int| = R|/x| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] get(): R|kotlin/Int| - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt index 21e1a25be21..2d9b21d76d8 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt @@ -7,9 +7,9 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorValueParameter.kt - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|X| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameterScript.txt index efcf305a48b..67775ec5747 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameterScript.txt @@ -11,9 +11,9 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorValueParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|X| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt index 8f8813d9eb4..119eca452bb 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorValueParameter.kt - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|X| { LAZY_super } @@ -16,4 +16,4 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorValueParameter.kt this(Int(1)) } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt index 240a726d041..516fac26834 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorValueParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|X| { LAZY_super } @@ -20,4 +20,4 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorValueParameterScript.kts this(Int(1)) } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollision.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollision.txt index a3e786b2be3..ff308cf36b8 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollision.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollision.txt @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -267,7 +267,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -325,7 +325,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollisionScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollisionScript.txt index dccb6d2b5b8..0c532fcd9b6 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollisionScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/component1TypeCollisionScript.txt @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -361,7 +361,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -396,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] component1TypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollision.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollision.txt index 9fcb462ad0d..b7083125146 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollision.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollision.txt @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -267,7 +267,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -325,7 +325,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollisionScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollisionScript.txt index 1f2971f2dfc..b77cf97c766 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollisionScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/copyTypeCollisionScript.txt @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -361,7 +361,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -396,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] copyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollision.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollision.txt index 53de0cd0e56..7c899931e5f 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollision.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollision.txt @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -267,7 +267,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -325,7 +325,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollisionScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollisionScript.txt index 8d017418527..7d8e27c09af 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollisionScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/parameterTypeCollisionScript.txt @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -361,7 +361,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -396,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { super() } @@ -451,3 +451,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] parameterTypeCollisionScript.kts public final [ResolvedTo(BODY_RESOLVE)] fun copy([ResolvedTo(BODY_RESOLVE)] prop: R|one/two/MyDataClass.MyClass| = this@R|one/two/MyDataClass|.R|one/two/MyDataClass.prop|): R|one/two/MyDataClass| } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollision.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollision.txt index f05f0782ae4..388725815da 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollision.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollision.txt @@ -64,7 +64,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -93,7 +93,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -267,7 +267,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -325,7 +325,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollision.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollisionScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollisionScript.txt index 2df8554c693..481d4db21f3 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollisionScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/classes/dataClass/propertyTypeCollisionScript.txt @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: MyClass): R|one/two/MyDataClass| { LAZY_super } @@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -326,7 +326,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -361,7 +361,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } @@ -396,7 +396,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyTypeCollisionScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|one/two/MyDataClass.MyClass|): R|one/two/MyDataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructor.txt index 8228a5f7659..b9fea6bbaed 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructor.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructor.txt @@ -51,7 +51,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(constructor)) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(parameter)) @Anno[Unresolved](LAZY_EXPRESSION) b: String): R|A| { LAZY_super } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(constructor)) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) i: Int, [ResolvedTo(COMPANION_GENERATION)] @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(parameter)) @Anno[Unresolved](LAZY_EXPRESSION) b: String): R|A| { LAZY_super } @@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -177,7 +177,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -219,7 +219,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| { LAZY_super } @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructor.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorProperty.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorProperty.txt index 0dcec6b0bbe..92735a4dadf 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorProperty.txt @@ -51,7 +51,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(constructor)) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(parameter)) @Anno[Unresolved](LAZY_EXPRESSION) b: String): R|A| { LAZY_super } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(constructor)) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) i: Int, [ResolvedTo(COMPANION_GENERATION)] @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(parameter)) @Anno[Unresolved](LAZY_EXPRESSION) b: String): R|A| { LAZY_super } @@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -177,7 +177,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -219,7 +219,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| { LAZY_super } @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorProperty.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt index 4f78954a882..78e4f03a43e 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorPropertyScript.txt @@ -68,7 +68,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(constructor)) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(parameter)) @Anno[Unresolved](LAZY_EXPRESSION) b: String): R|A| { LAZY_super } @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(constructor)) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) i: Int, [ResolvedTo(COMPANION_GENERATION)] @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(parameter)) @Anno[Unresolved](LAZY_EXPRESSION) b: String): R|A| { LAZY_super } @@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -230,7 +230,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -257,7 +257,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| { LAZY_super } @@ -311,7 +311,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorPropertyScri } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt index 783221d324f..2c86dda457a 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/compilerRequiredAnnotationsOnConstructorScript.txt @@ -68,7 +68,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(constructor)) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(parameter)) @Anno[Unresolved](LAZY_EXPRESSION) b: String): R|A| { LAZY_super } @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(constructor)) @Anno[Unresolved](LAZY_EXPRESSION) public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(param)) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) i: Int, [ResolvedTo(COMPANION_GENERATION)] @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(parameter)) @Anno[Unresolved](LAZY_EXPRESSION) b: String): R|A| { LAZY_super } @@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -230,7 +230,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -257,7 +257,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](String(constructor)) @R|Anno|[Types](LAZY_EXPRESSION) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](String(parameter)) @R|Anno|[Types](LAZY_EXPRESSION) b: R|kotlin/String|): R|A| { LAZY_super } @@ -284,7 +284,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| { LAZY_super } @@ -311,7 +311,7 @@ FILE: [ResolvedTo(IMPORTS)] compilerRequiredAnnotationsOnConstructorScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { @R|kotlin/Deprecated|[Types](message = String(constructor)) @R|Anno|[Types](s = String(constructor)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/A.i] @CONSTRUCTOR_PARAMETER:R|kotlin/Deprecated|[Types](message = String(param)) @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = String(param)) i: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] @R|kotlin/Deprecated|[Types](message = String(parameter)) @R|Anno|[Types](s = String(parameter)) b: R|kotlin/String|): R|A| { super() } @@ -347,3 +347,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] compilerRequiredAnnotationsOnConstructorScript. public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclaration.txt b/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclaration.txt index ce84d69fec1..0191ccb8003 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclaration.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclaration.txt @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class I : P { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class I : P { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super

} @@ -356,7 +356,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class I : P { + public? final? [ResolvedTo(COMPANION_GENERATION)] class I : P { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super

} @@ -724,7 +724,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class I : R|P| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super } @@ -816,7 +816,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(CONTRACTS)] class I : R|P| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super } @@ -908,7 +908,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class I : R|P| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super } @@ -1000,7 +1000,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class I : R|P| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super } @@ -1092,7 +1092,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclaration.kt LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class I : R|P| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=I] constructor(): R|B.I| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclarationScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclarationScript.txt index b616ba63cde..75dcd5c6bb5 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclarationScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/complexRedeclarationScript.txt @@ -301,7 +301,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class I : P { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class I : P { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super

} @@ -406,7 +406,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class I : P { + public? final? [ResolvedTo(COMPANION_GENERATION)] class I : P { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super

} @@ -826,7 +826,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class I : R|P| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super } @@ -931,7 +931,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(CONTRACTS)] class I : R|P| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super } @@ -1036,7 +1036,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class I : R|P| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super } @@ -1141,7 +1141,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class I : R|P| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=I] constructor(): R|B.I| { LAZY_super } @@ -1246,7 +1246,7 @@ FILE: [ResolvedTo(IMPORTS)] complexRedeclarationScript.kts LAZY_super } - public final [ResolvedTo(STATUS)] class I : R|P| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class I : R|P| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=I] constructor(): R|B.I| { super() } @@ -1388,3 +1388,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] complexRedeclarationScript.kts } } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopy.txt b/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopy.txt index 6628862d9f2..e3d377e7d0e 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopy.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopy.txt @@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super } @@ -63,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super } @@ -147,7 +147,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class DataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=DataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -168,7 +168,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -189,7 +189,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class DataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=DataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -210,7 +210,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -231,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] dataClassCopy.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopyScript.txt index 60baf87ab11..6422249281a 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopyScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/dataClassCopyScript.txt @@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super } @@ -82,7 +82,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super } @@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class DataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=DataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -212,7 +212,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class DataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=DataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -290,7 +290,7 @@ FILE: [ResolvedTo(IMPORTS)] dataClassCopyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [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 ba6ceb095b6..ac3987ce96a 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2.txt @@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super } @@ -63,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super } @@ -147,7 +147,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class DataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=DataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -168,7 +168,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -189,7 +189,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class DataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=DataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -210,7 +210,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -231,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] dataComponent2.kt - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2Script.txt b/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2Script.txt index a68167b05e3..b2e2a91042f 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2Script.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/dataComponent2Script.txt @@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super } @@ -82,7 +82,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? data [ResolvedTo(RAW_FIR)] class DataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class DataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=DataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.i] i: Int, [ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/DataClass.b] b: Boolean): R|one/DataClass| { LAZY_super } @@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class DataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=DataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -212,7 +212,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -238,7 +238,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class DataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=DataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } @@ -290,7 +290,7 @@ FILE: [ResolvedTo(IMPORTS)] dataComponent2Script.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final data [ResolvedTo(STATUS)] class DataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class DataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=DataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.i] i: R|kotlin/Int|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/DataClass.b] b: R|kotlin/Boolean|): R|one/DataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructor.txt index f99e774b27e..1398a9997da 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructor.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructor.txt @@ -22,7 +22,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -33,7 +33,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -77,7 +77,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Problem : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -99,7 +99,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Problem : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -121,7 +121,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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/fakePrimaryConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructorScript.txt index d86bc068eaf..a2c32d1fdbb 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructorScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/fakePrimaryConstructorScript.txt @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -52,7 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Problem : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -148,7 +148,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Problem : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -164,7 +164,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] fakePrimaryConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() } @@ -205,3 +205,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] fakePrimaryConstructorScript.kts } } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClash.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClash.txt index 4f4e2ea20af..bb63a7d77cb 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClash.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClash.txt @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : Base { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : Base { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|second/Base| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -182,7 +182,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|second/Base| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -204,7 +204,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|second/Base| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -226,7 +226,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -248,7 +248,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructor.txt index f37f3283ae6..2613ccedaa8 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructor.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructor.txt @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : Base { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : Base { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|second/Base| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -182,7 +182,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|second/Base| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -204,7 +204,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|second/Base| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -226,7 +226,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -248,7 +248,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructorScript.txt index 53c74eec9ed..f2a039a12f0 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructorScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashImplicitConstructorScript.txt @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : Base { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : Base { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|second/Base| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -235,7 +235,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|second/Base| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -263,7 +263,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|second/Base| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -319,7 +319,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashImplicitConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashScript.txt index 33cffb73ffd..c07e7bbca23 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNameClashScript.txt @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : Base { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : Base { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|second/Base| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -235,7 +235,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|second/Base| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -263,7 +263,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|second/Base| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super } @@ -319,7 +319,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClash.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClash.txt index a1e7ad56d1b..0f90c40f797 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClash.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClash.txt @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : Base> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>> } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : Base> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>> } @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|second/Base>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -182,7 +182,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|second/Base>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -204,7 +204,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|second/Base>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -226,7 +226,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -248,7 +248,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClash.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { super>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructor.txt index 9c9e5a2d139..ee8f1d41abf 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructor.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructor.txt @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : Base> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>> } @@ -72,7 +72,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : Base> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>> } @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|second/Base>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -182,7 +182,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|second/Base>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -204,7 +204,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|second/Base>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -226,7 +226,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -248,7 +248,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { super>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructorScript.txt index 17f0a411dad..35e92347530 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructorScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashImplicitConstructorScript.txt @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : Base> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>> } @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : Base> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>> } @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|second/Base>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -235,7 +235,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|second/Base>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -263,7 +263,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|second/Base>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -319,7 +319,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashImplicitConstructorScrip } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { super>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashScript.txt index 2b3bc95cc32..406816478bc 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/functions/superTypeCallNestedNameClashScript.txt @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : Base> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>> } @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : Base> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : Base> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>> } @@ -207,7 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|second/Base>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -235,7 +235,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|second/Base>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -263,7 +263,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|second/Base>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -291,7 +291,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super>|> } @@ -319,7 +319,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|second/Base>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { super>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructor.txt index 838cd9849b2..873206380d2 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructor.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructor.txt @@ -22,7 +22,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -33,7 +33,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -77,7 +77,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Problem : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -99,7 +99,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Problem : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -121,7 +121,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructor.kt - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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 e638375a6cb..e163057d075 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameter.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameter.txt @@ -22,7 +22,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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 } @@ -33,7 +33,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] 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 } @@ -77,7 +77,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] 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 } @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class A : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] a: R|kotlin/Boolean|, [ResolvedTo(CONTRACTS)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(CONTRACTS)] c: R|kotlin/Long|): R|A| { LAZY_super } @@ -99,7 +99,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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| = LAZY_EXPRESSION, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] c: R|kotlin/Long|): R|A| { LAZY_super } @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] a: R|kotlin/Boolean|, [ResolvedTo(ANNOTATION_ARGUMENTS)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(ANNOTATION_ARGUMENTS)] c: R|kotlin/Long|): R|A| { LAZY_super } @@ -121,7 +121,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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/primaryConstructorParameterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameterScript.txt index 15330aa175f..04e1a08d90c 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameterScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorParameterScript.txt @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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 } @@ -52,7 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] 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 } @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] 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 } @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class A : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor([ResolvedTo(CONTRACTS)] a: R|kotlin/Boolean|, [ResolvedTo(CONTRACTS)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(CONTRACTS)] c: R|kotlin/Long|): R|A| { LAZY_super } @@ -148,7 +148,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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| = LAZY_EXPRESSION, [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] c: R|kotlin/Long|): R|A| { LAZY_super } @@ -164,7 +164,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] a: R|kotlin/Boolean|, [ResolvedTo(ANNOTATION_ARGUMENTS)] param: R|kotlin/Int| = LAZY_EXPRESSION, [ResolvedTo(ANNOTATION_ARGUMENTS)] c: R|kotlin/Long|): R|A| { LAZY_super } @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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() } @@ -206,3 +206,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] primaryConstructorParameterScript.kts } } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorProperty.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorProperty.txt index 867df80009e..4f9c8742b60 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorProperty.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorProperty.txt @@ -28,7 +28,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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 } @@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] 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 } @@ -98,7 +98,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] 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 } @@ -112,7 +112,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] 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| = LAZY_EXPRESSION): R|A| { LAZY_super } @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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| = LAZY_EXPRESSION): R|A| { LAZY_super } @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] a: R|kotlin/Boolean|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| { LAZY_super } @@ -154,7 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorProperty.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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/primaryConstructorPropertyScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorPropertyScript.txt index d4c71a81bec..5b4cbd75407 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorPropertyScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorPropertyScript.txt @@ -42,7 +42,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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 } @@ -61,7 +61,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] 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 } @@ -137,7 +137,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] 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 } @@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] 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| = LAZY_EXPRESSION): R|A| { LAZY_super } @@ -175,7 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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| = LAZY_EXPRESSION): R|A| { LAZY_super } @@ -194,7 +194,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] a: R|kotlin/Boolean|, [ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/A.prop] prop: R|kotlin/Int| = LAZY_EXPRESSION): R|A| { LAZY_super } @@ -213,7 +213,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorPropertyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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() } @@ -245,3 +245,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] primaryConstructorPropertyScript.kts } } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorScript.txt index 9aed44c4f3f..ceb66a9b191 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/primaryConstructorScript.txt @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -52,7 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class Problem : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class Problem : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -116,7 +116,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Problem : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -148,7 +148,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Problem : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -164,7 +164,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Problem] constructor(): R|Problem| { LAZY_super } @@ -180,7 +180,7 @@ FILE: [ResolvedTo(IMPORTS)] primaryConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class Problem : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Problem : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Problem] constructor(): R|Problem| { super() } @@ -205,3 +205,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] primaryConstructorScript.kts } } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/constructorParameter.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/constructorParameter.txt index 36b608f86a6..26d98d88b23 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/properties/constructorParameter.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/constructorParameter.txt @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public? final? [ResolvedTo(RAW_FIR)] class Sub : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Sub : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Sub] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/Sub.prop] @FieldAnnotation[Unresolved](LAZY_EXPRESSION) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) prop: Int): R|Sub| { LAZY_super } @@ -123,7 +123,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public? final? [ResolvedTo(RAW_FIR)] class Sub : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class Sub : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Sub] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/Sub.prop] @FieldAnnotation[Unresolved](LAZY_EXPRESSION) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) prop: Int): R|Sub| { LAZY_super } @@ -263,7 +263,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Sub : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Sub] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -298,7 +298,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -333,7 +333,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Sub : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Sub] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -368,7 +368,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = (String(param), R|/stringConstant|)) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -403,7 +403,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameter.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Sub] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = (String(param), R|/stringConstant|)) prop: R|kotlin/Int|): R|Sub| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/constructorParameterWithImplicitParameterAnnotation.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/constructorParameterWithImplicitParameterAnnotation.txt index f56ca2c2390..dec861394b9 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/properties/constructorParameterWithImplicitParameterAnnotation.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/constructorParameterWithImplicitParameterAnnotation.txt @@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterWithImplicitParameterAnnotation. public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public? final? [ResolvedTo(RAW_FIR)] class Sub : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Sub : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Sub] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/Sub.prop] @ParameterAnnotation[Unresolved](LAZY_EXPRESSION) prop: Int): R|Sub| { LAZY_super } @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterWithImplicitParameterAnnotation. public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public? final? [ResolvedTo(RAW_FIR)] class Sub : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class Sub : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Sub] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/Sub.prop] @ParameterAnnotation[Unresolved](LAZY_EXPRESSION) prop: Int): R|Sub| { LAZY_super } @@ -177,7 +177,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterWithImplicitParameterAnnotation. public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Sub : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Sub] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -201,7 +201,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterWithImplicitParameterAnnotation. public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -225,7 +225,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterWithImplicitParameterAnnotation. public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Sub : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Sub] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -249,7 +249,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterWithImplicitParameterAnnotation. public [ResolvedTo(STATUS)] [ContainingClassKey=ParameterAnnotation] get(): R|kotlin/Int| } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](i = R|/konstant|) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -273,7 +273,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorParameterWithImplicitParameterAnnotation. public [ResolvedTo(STATUS)] [ContainingClassKey=ParameterAnnotation] get(): R|kotlin/Int| } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Sub] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](i = R|/konstant|) prop: R|kotlin/Int|): R|Sub| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/generatedPropertyFromParameter.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/generatedPropertyFromParameter.txt index 63505e37624..1e2ce5aff9b 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/properties/generatedPropertyFromParameter.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/generatedPropertyFromParameter.txt @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public? final? [ResolvedTo(RAW_FIR)] class Sub : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Sub : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Sub] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/Sub.prop] @FieldAnnotation[Unresolved](LAZY_EXPRESSION) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) prop: Int): R|Sub| { LAZY_super } @@ -123,7 +123,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public? final? [ResolvedTo(RAW_FIR)] class Sub : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class Sub : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Sub] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/Sub.prop] @FieldAnnotation[Unresolved](LAZY_EXPRESSION) @CONSTRUCTOR_PARAMETER:Anno[Unresolved](LAZY_EXPRESSION) prop: Int): R|Sub| { LAZY_super } @@ -263,7 +263,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Sub : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Sub] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -298,7 +298,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -333,7 +333,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameter.kt public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Sub : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Sub] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -368,7 +368,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameter.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = (String(param), R|/stringConstant|)) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -403,7 +403,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameter.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/Sub.prop] @CONSTRUCTOR_PARAMETER:R|Anno|[Types](s = (String(param), R|/stringConstant|)) prop: R|kotlin/Int|): R|Sub| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/properties/generatedPropertyFromParameterWithImplicitAnnotation.txt b/analysis/low-level-api-fir/testData/lazyResolve/properties/generatedPropertyFromParameterWithImplicitAnnotation.txt index 9f8e622e921..dd71cf5229e 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/properties/generatedPropertyFromParameterWithImplicitAnnotation.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/properties/generatedPropertyFromParameterWithImplicitAnnotation.txt @@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameterWithImplicitAnnotation public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public? final? [ResolvedTo(RAW_FIR)] class Sub : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class Sub : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=Sub] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=/Sub.prop] @ParameterAnnotation[Unresolved](LAZY_EXPRESSION) prop: Int): R|Sub| { LAZY_super } @@ -81,7 +81,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameterWithImplicitAnnotation public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public? final? [ResolvedTo(RAW_FIR)] class Sub : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class Sub : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=Sub] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=/Sub.prop] @ParameterAnnotation[Unresolved](LAZY_EXPRESSION) prop: Int): R|Sub| { LAZY_super } @@ -177,7 +177,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameterWithImplicitAnnotation public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class Sub : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=Sub] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -201,7 +201,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameterWithImplicitAnnotation public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -225,7 +225,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameterWithImplicitAnnotation public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ParameterAnnotation] get(): Int } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class Sub : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Sub] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](LAZY_EXPRESSION) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -249,7 +249,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameterWithImplicitAnnotation public [ResolvedTo(STATUS)] [ContainingClassKey=ParameterAnnotation] get(): R|kotlin/Int| } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](i = R|/konstant|) prop: R|kotlin/Int|): R|Sub| { LAZY_super } @@ -273,7 +273,7 @@ FILE: [ResolvedTo(IMPORTS)] generatedPropertyFromParameterWithImplicitAnnotation public [ResolvedTo(STATUS)] [ContainingClassKey=ParameterAnnotation] get(): R|kotlin/Int| } - public final [ResolvedTo(STATUS)] class Sub : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Sub : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Sub] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/Sub.prop] @R|ParameterAnnotation|[Types](i = R|/konstant|) prop: R|kotlin/Int|): R|Sub| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/redeclaration.txt b/analysis/low-level-api-fir/testData/lazyResolve/redeclaration.txt index c2ad3789970..42d9f6ceece 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/redeclaration.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/redeclaration.txt @@ -36,7 +36,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt } } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class A : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -51,7 +51,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt } } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class A : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -111,7 +111,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt } } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class A : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt } } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class A : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -141,7 +141,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt } } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class A : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -156,7 +156,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt } } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -171,7 +171,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclaration.kt } } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/redeclarationScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/redeclarationScript.txt index 45c7b28b662..fd9358be108 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/redeclarationScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/redeclarationScript.txt @@ -53,7 +53,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class A : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -74,7 +74,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] class A : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -158,7 +158,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class A : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -179,7 +179,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] class A : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -200,7 +200,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class A : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -221,7 +221,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -242,7 +242,7 @@ FILE: [ResolvedTo(IMPORTS)] redeclarationScript.kts } - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| { super() } @@ -269,3 +269,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] redeclarationScript.kts } } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameter.txt b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameter.txt index 6334dd88bd2..bb575b74d9e 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameter.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameter.txt @@ -38,7 +38,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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 } @@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] 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 } @@ -133,7 +133,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] 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 } @@ -152,7 +152,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] 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 } @@ -171,7 +171,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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 } @@ -190,7 +190,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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 } @@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameter.kt - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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/secondaryConstructorParameterScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameterScript.txt index c3405b2fd9c..37a22125781 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameterScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/secondaryConstructorParameterScript.txt @@ -54,7 +54,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] 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 } @@ -79,7 +79,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { + public? final? [ResolvedTo(COMPANION_GENERATION)] 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 } @@ -179,7 +179,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] 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 } @@ -204,7 +204,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(CONTRACTS)] 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 } @@ -229,7 +229,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] 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 } @@ -254,7 +254,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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 } @@ -279,7 +279,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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 } @@ -327,3 +327,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] secondaryConstructorParameterScript.kts public final [ResolvedTo(BODY_RESOLVE)] fun R|kotlin/String|.myToInt(): R|kotlin/Int| { ^myToInt Int(42) } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideConstructor.txt b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideConstructor.txt index ff80cf80b38..e6b47ce400b 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideConstructor.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideConstructor.txt @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt COMPILER_REQUIRED_ANNOTATIONS: FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt - public? abstract [ResolvedTo(RAW_FIR)] class SubClass : AbstractClass { + public? abstract [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class SubClass : AbstractClass { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super> } @@ -45,7 +45,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt COMPANION_GENERATION: FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt - public? abstract [ResolvedTo(RAW_FIR)] class SubClass : AbstractClass { + public? abstract [ResolvedTo(COMPANION_GENERATION)] class SubClass : AbstractClass { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super> } @@ -105,7 +105,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt EXPECT_ACTUAL_MATCHING: FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super|> } @@ -120,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt CONTRACTS: FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(CONTRACTS)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super|> } @@ -135,7 +135,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super|> } @@ -150,7 +150,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(ANNOTATION_ARGUMENTS)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super|> } @@ -165,7 +165,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructor.kt - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(ANNOTATION_ARGUMENTS)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { super|>(Int(0)) } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideConstructorScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideConstructorScript.txt index d07d6c8e4b0..8ab6d5945ec 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideConstructorScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/substitutionFakeOverrideConstructorScript.txt @@ -46,7 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructorScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? abstract [ResolvedTo(RAW_FIR)] class SubClass : AbstractClass { + public? abstract [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class SubClass : AbstractClass { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super> } @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructorScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? abstract [ResolvedTo(RAW_FIR)] class SubClass : AbstractClass { + public? abstract [ResolvedTo(COMPANION_GENERATION)] class SubClass : AbstractClass { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super> } @@ -151,7 +151,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructorScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super|> } @@ -172,7 +172,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(CONTRACTS)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super|> } @@ -193,7 +193,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super|> } @@ -214,7 +214,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(ANNOTATION_ARGUMENTS)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { LAZY_super|> } @@ -235,7 +235,7 @@ FILE: [ResolvedTo(IMPORTS)] substitutionFakeOverrideConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public abstract [ResolvedTo(STATUS)] class SubClass : R|second/AbstractClass| { + public abstract [ResolvedTo(ANNOTATION_ARGUMENTS)] class SubClass : R|second/AbstractClass| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=SubClass] constructor(): R|second/SubClass| { super|>(Int(0)) } @@ -269,3 +269,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] substitutionFakeOverrideConstructorScript.kts } } + diff --git a/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithAnnotationOnType.txt b/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithAnnotationOnType.txt index 86bf8c3aefb..dbee7806711 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithAnnotationOnType.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/typeAliases/typeAliasWithAnnotationOnType.txt @@ -130,7 +130,7 @@ FILE: [ResolvedTo(IMPORTS)] typeAliasWithAnnotationOnType.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] typeAliasWithAnnotationOnType.kt - @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class TypeAnnWithArg : R|kotlin/Annotation| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] annotation class TypeAnnWithArg : R|kotlin/Annotation| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=TypeAnnWithArg] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/TypeAnnWithArg.arg] arg: R|kotlin/String|): R|TypeAnnWithArg| { LAZY_super } @@ -143,7 +143,7 @@ FILE: [ResolvedTo(IMPORTS)] typeAliasWithAnnotationOnType.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] typeAliasWithAnnotationOnType.kt - @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class TypeAnnWithArg : R|kotlin/Annotation| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] annotation class TypeAnnWithArg : R|kotlin/Annotation| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=TypeAnnWithArg] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=/TypeAnnWithArg.arg] arg: R|kotlin/String|): R|TypeAnnWithArg| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt index 2db37b3655b..3a7ce3664b9 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.after.txt @@ -28,7 +28,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.lazyResolve.txt index e102e085d39..790a2b600c4 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotations.lazyResolve.txt @@ -117,7 +117,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|one/two/MyDataClass| { LAZY_super } @@ -167,7 +167,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt } } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|one/two/MyDataClass| { LAZY_super } @@ -367,7 +367,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } @@ -417,7 +417,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } @@ -467,7 +467,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } @@ -517,7 +517,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } @@ -567,7 +567,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotations.kt } } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt index 6fb06ac33d0..bfc9a38297c 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.after.txt @@ -35,7 +35,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.lazyResolve.txt index 79e1212be30..05825d2f5a5 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/class/parameterTypeCollisionAndAnnotationsScript.lazyResolve.txt @@ -140,7 +140,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|one/two/MyDataClass| { LAZY_super } @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts } - public? final? data [ResolvedTo(RAW_FIR)] class MyDataClass : R|kotlin/Any| { + public? final? data [ResolvedTo(COMPANION_GENERATION)] class MyDataClass : R|kotlin/Any| { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(COMPANION_GENERATION)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) MyClass<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|one/two/MyDataClass| { LAZY_super } @@ -430,7 +430,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } @@ -488,7 +488,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(CONTRACTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(CONTRACTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } @@ -546,7 +546,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(IntegerLiteral(0).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(1).plus#(constant#)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(IntegerLiteral(2).plus#(constant#)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } @@ -604,7 +604,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { LAZY_super } @@ -662,7 +662,7 @@ FILE: [ResolvedTo(IMPORTS)] parameterTypeCollisionAndAnnotationsScript.kts } - public final data [ResolvedTo(STATUS)] class MyDataClass : R|kotlin/Any| { + public final data [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyDataClass : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyDataClass] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=one/two/MyDataClass.prop] prop: R|@R|one/two/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) one/two/MyDataClass.MyClass<@R|one/two/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|one/two/MyDataClass.Companion|.R|one/two/MyDataClass.Companion.constant|)) kotlin/Int>>|): R|one/two/MyDataClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.before.txt index 45b2dead06f..d5a94d31565 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.before.txt @@ -28,7 +28,7 @@ FILE: [ResolvedTo(IMPORTS)] call.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.lazyResolve.txt index 0b064b57ff7..e62ae7fb99f 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/call.lazyResolve.txt @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] call.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<@Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>> } @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] call.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<@Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>> } @@ -199,7 +199,7 @@ FILE: [ResolvedTo(IMPORTS)] call.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -225,7 +225,7 @@ FILE: [ResolvedTo(IMPORTS)] call.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -251,7 +251,7 @@ FILE: [ResolvedTo(IMPORTS)] call.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -260,26 +260,26 @@ FILE: [ResolvedTo(IMPORTS)] call.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] call.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { LAZY_super } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { - LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> + LAZY_super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|> } } @@ -303,7 +303,7 @@ FILE: [ResolvedTo(IMPORTS)] call.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.before.txt index 73bc3d2393b..1d7998eaa25 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.before.txt @@ -35,7 +35,7 @@ FILE: [ResolvedTo(IMPORTS)] callScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.lazyResolve.txt index d881da5f343..f134b790ff1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callScript.lazyResolve.txt @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] callScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<@Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>> } @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] callScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<@Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>> } @@ -262,7 +262,7 @@ FILE: [ResolvedTo(IMPORTS)] callScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] callScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -330,7 +330,7 @@ FILE: [ResolvedTo(IMPORTS)] callScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -344,18 +344,18 @@ FILE: [ResolvedTo(IMPORTS)] callScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { @@ -364,9 +364,9 @@ FILE: [ResolvedTo(IMPORTS)] callScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { - LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> + LAZY_super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|> } } @@ -398,7 +398,7 @@ FILE: [ResolvedTo(IMPORTS)] callScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.before.txt index fb940cc6b55..728a1363c99 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.before.txt @@ -28,7 +28,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.lazyResolve.txt index 324c23dfa17..060ce799aff 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructor.lazyResolve.txt @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructor.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<@Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>> } @@ -95,7 +95,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructor.kt } } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<@Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>> } @@ -199,7 +199,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -225,7 +225,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -251,7 +251,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -260,26 +260,26 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructor.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] callWithConstructor.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { LAZY_super } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { - LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> + LAZY_super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|> } } @@ -303,7 +303,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructor.kt } } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.before.txt index 0c91daff18f..4258a5f2614 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.before.txt @@ -35,7 +35,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.lazyResolve.txt index 4010452d7b6..ac303aa2f34 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/callWithConstructorScript.lazyResolve.txt @@ -92,7 +92,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructorScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<@Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>> } @@ -126,7 +126,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructorScript.kts } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<@Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>>> } @@ -262,7 +262,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -330,7 +330,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> } @@ -344,18 +344,18 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { @@ -364,9 +364,9 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|((String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { - LAZY_super(String(super type call ), prop#)) util/AbstractClass<@R|util/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|util/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>|> + LAZY_super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|> } } @@ -398,7 +398,7 @@ FILE: [ResolvedTo(IMPORTS)] callWithConstructorScript.kts } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.after.txt index 1f61044b886..2dceb7128e1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.after.txt @@ -1,18 +1,18 @@ FILE: [ResolvedTo(IMPORTS)] reference.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.before.txt index 1f61044b886..2dceb7128e1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.before.txt @@ -1,18 +1,18 @@ FILE: [ResolvedTo(IMPORTS)] reference.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.lazyResolve.txt index 9e4a7a72367..039459749bf 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/reference.lazyResolve.txt @@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] reference.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -79,7 +79,7 @@ FILE: [ResolvedTo(IMPORTS)] reference.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -167,7 +167,7 @@ FILE: [ResolvedTo(IMPORTS)] reference.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -189,7 +189,7 @@ FILE: [ResolvedTo(IMPORTS)] reference.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -211,7 +211,7 @@ FILE: [ResolvedTo(IMPORTS)] reference.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -220,20 +220,20 @@ FILE: [ResolvedTo(IMPORTS)] reference.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] reference.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -242,20 +242,20 @@ FILE: [ResolvedTo(IMPORTS)] reference.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] reference.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.after.txt index 4aa922375b5..1e22022ebb1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.after.txt @@ -3,23 +3,23 @@ FILE: [ResolvedTo(IMPORTS)] referenceScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.before.txt index 4aa922375b5..1e22022ebb1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.before.txt @@ -3,23 +3,23 @@ FILE: [ResolvedTo(IMPORTS)] referenceScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.lazyResolve.txt index 03ac7740156..234489d900f 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceScript.lazyResolve.txt @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceScript.kts public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceScript.kts public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -230,7 +230,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceScript.kts public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -260,7 +260,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceScript.kts public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -290,7 +290,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceScript.kts public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -304,23 +304,23 @@ FILE: [ResolvedTo(IMPORTS)] referenceScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -334,23 +334,23 @@ FILE: [ResolvedTo(IMPORTS)] referenceScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.after.txt index b9b9b1fd876..0e2a353bc31 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.after.txt @@ -1,18 +1,18 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.before.txt index b9b9b1fd876..0e2a353bc31 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.before.txt @@ -1,18 +1,18 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.lazyResolve.txt index 2774bdfcbb1..ec9b125f2e1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructor.lazyResolve.txt @@ -57,7 +57,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -79,7 +79,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -167,7 +167,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -189,7 +189,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -211,7 +211,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -220,20 +220,20 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -242,20 +242,20 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt BODY_RESOLVE: FILE: [ResolvedTo(IMPORTS)] referenceWithConstructor.kt - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.after.txt index 5ab3eece51a..95462757ca0 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.after.txt @@ -3,23 +3,23 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.before.txt index 5ab3eece51a..95462757ca0 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.before.txt @@ -3,23 +3,23 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.lazyResolve.txt index 9153978c889..ef4b964fac6 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/referenceWithConstructorScript.lazyResolve.txt @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructorScript.kts public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructorScript.kts public? final? [ResolvedTo(RAW_FIR)] interface I : R|kotlin/Any| { } - public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) I>> { public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -230,7 +230,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructorScript.kts public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -260,7 +260,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructorScript.kts public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -290,7 +290,7 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructorScript.kts public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -304,23 +304,23 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_super<> } @@ -334,23 +334,23 @@ FILE: [ResolvedTo(IMPORTS)] referenceWithConstructorScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| public? final? [ResolvedTo(SUPER_TYPES)] interface I : R|kotlin/Any| { } - public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) util/I>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) util/I>>| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.after.txt new file mode 100644 index 00000000000..335c7ea82f1 --- /dev/null +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.after.txt @@ -0,0 +1,36 @@ +@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>> + context -> FirConstructorSymbol util/MyClass.MyClass + anchor -> [FirRegularClassSymbol util/MyClass] + +@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int> + context -> FirConstructorSymbol util/MyClass.MyClass + anchor -> [FirRegularClassSymbol util/MyClass] + +@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int + context -> FirConstructorSymbol util/MyClass.MyClass + anchor -> [FirRegularClassSymbol util/MyClass] + +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { + LAZY_super + } + + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| + + } + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| + public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { + public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { + super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() + } + + } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.before.txt new file mode 100644 index 00000000000..335c7ea82f1 --- /dev/null +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.before.txt @@ -0,0 +1,36 @@ +@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>> + context -> FirConstructorSymbol util/MyClass.MyClass + anchor -> [FirRegularClassSymbol util/MyClass] + +@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int> + context -> FirConstructorSymbol util/MyClass.MyClass + anchor -> [FirRegularClassSymbol util/MyClass] + +@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int + context -> FirConstructorSymbol util/MyClass.MyClass + anchor -> [FirRegularClassSymbol util/MyClass] + +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { + LAZY_super + } + + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| + + } + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| + public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { + public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { + super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() + } + + } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.kt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.kt new file mode 100644 index 00000000000..e089c977059 --- /dev/null +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.kt @@ -0,0 +1,15 @@ +// BODY_RESOLVE +package util + +@Target(AnnotationTarget.TYPE) +annotation class Anno(val position: String) + +const val prop = "str" + +abstract class AbstractClass + +class MyClass : @Anno("super type call $prop") AbstractClass<@Anno("nested super type ref $prop") List<@Anno("nested nested super type ref $prop") Int>> { + constructor(): super() { + + } +} diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.lazyResolve.txt new file mode 100644 index 00000000000..7644738275c --- /dev/null +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructor.lazyResolve.txt @@ -0,0 +1,321 @@ +RAW_FIR: +FILE: [ResolvedTo(RAW_FIR)] secondaryConstructor.kt + @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public? abstract [ResolvedTo(RAW_FIR)] class AbstractClass<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(RAW_FIR)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_BLOCK } + + } + +IMPORTS: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public? abstract [ResolvedTo(RAW_FIR)] class AbstractClass<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(RAW_FIR)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public? final? [ResolvedTo(RAW_FIR)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_BLOCK } + + } + +COMPILER_REQUIRED_ANNOTATIONS: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public? abstract [ResolvedTo(RAW_FIR)] class AbstractClass<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(RAW_FIR)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_BLOCK } + + } + +COMPANION_GENERATION: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public? abstract [ResolvedTo(RAW_FIR)] class AbstractClass<[ResolvedTo(RAW_FIR)] T> : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(RAW_FIR)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public? final? [ResolvedTo(COMPANION_GENERATION)] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) AbstractClass<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? [ResolvedTo(COMPANION_GENERATION)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_BLOCK } + + } + +SUPER_TYPES: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public? abstract [ResolvedTo(SUPER_TYPES)] class AbstractClass<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public? final? [ResolvedTo(SUPER_TYPES)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) util/AbstractClass<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { + public? [ResolvedTo(SUPER_TYPES)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_BLOCK } + + } + +TYPES: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public? abstract [ResolvedTo(SUPER_TYPES)] class AbstractClass<[ResolvedTo(SUPER_TYPES)] T> : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(SUPER_TYPES)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public? final? [ResolvedTo(TYPES)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) util/AbstractClass<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { + public? [ResolvedTo(TYPES)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_BLOCK } + + } + +STATUS: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { + public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public final [ResolvedTo(STATUS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) util/AbstractClass<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_BLOCK } + + } + +EXPECT_ACTUAL_MATCHING: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { + public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) util/AbstractClass<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { + public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { LAZY_BLOCK } + + } + +CONTRACTS: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { + public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public final [ResolvedTo(CONTRACTS)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) util/AbstractClass<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { + super<>() + } + + } + +IMPLICIT_TYPES_BODY_RESOLVE: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=util/Anno.position] position: String): R|util/Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val position: String = R|/position| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + } + public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION + public? [ResolvedTo(RAW_FIR)] get(): + public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { + public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] class MyClass : R|@R|util/Anno|(LAZY_EXPRESSION) util/AbstractClass<@R|util/Anno|(LAZY_EXPRESSION) kotlin/collections/List<@R|util/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { + super<>() + } + + } + +ANNOTATION_ARGUMENTS: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { + LAZY_super + } + + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| + + } + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| + public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { + public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { + super<>() + } + + } + +BODY_RESOLVE: +FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { + LAZY_super + } + + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| + + } + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| + public abstract [ResolvedTo(STATUS)] class AbstractClass<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { + public [ResolvedTo(STATUS)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(STATUS)] T>(): R|util/AbstractClass| { + LAZY_super + } + + } + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { + super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() + } + + } + +FILE RAW TO BODY: +FILE: [ResolvedTo(BODY_RESOLVE)] secondaryConstructor.kt + @R|kotlin/annotation/Target|[Types](allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final [ResolvedTo(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=util/Anno.position] position: R|kotlin/String|): R|util/Anno| { + super() + } + + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val position: R|kotlin/String| = R|/position| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Anno] get(): R|kotlin/String| + + } + public final const [ResolvedTo(BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| + public abstract [ResolvedTo(BODY_RESOLVE)] class AbstractClass<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=AbstractClass] constructor<[ResolvedTo(BODY_RESOLVE)] T>(): R|util/AbstractClass| { + super() + } + + } + public final [ResolvedTo(BODY_RESOLVE)] class MyClass : R|@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=MyClass] constructor(): R|util/MyClass| { + super(String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>>|>() + } + + } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructorScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructorScript.after.txt new file mode 100644 index 00000000000..b873ea70b89 --- /dev/null +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/constructor/secondaryConstructorScript.after.txt @@ -0,0 +1,43 @@ +@R|util/Anno|(position = (String(super type call ), R|util/prop|)) util/AbstractClass<@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int>> + context -> FirConstructorSymbol util/MyClass.MyClass + anchor -> [FirRegularClassSymbol util/MyClass] + +@R|util/Anno|(position = (String(nested super type ref ), R|util/prop|)) kotlin/collections/List<@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int> + context -> FirConstructorSymbol util/MyClass.MyClass + anchor -> [FirRegularClassSymbol util/MyClass] + +@R|util/Anno|(position = (String(nested nested super type ref ), R|util/prop|)) kotlin/Int + context -> FirConstructorSymbol util/MyClass.MyClass + anchor -> [FirRegularClassSymbol util/MyClass] + +FILE: [ResolvedTo(IMPORTS)] secondaryConstructorScript.kts + context(