diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedAnnotationDeserializer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedAnnotationDeserializer.kt index 4f5b4a029fb..59ec718a015 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedAnnotationDeserializer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedAnnotationDeserializer.kt @@ -60,17 +60,21 @@ class StubBasedAnnotationDeserializer( private fun deserializeAnnotation( ktAnnotation: KtAnnotationEntry ): FirAnnotation { - val userType = - ktAnnotation.getStubOrPsiChild(KtStubElementTypes.CONSTRUCTOR_CALLEE)?.getStubOrPsiChild(KtStubElementTypes.TYPE_REFERENCE) - ?.getStubOrPsiChild(KtStubElementTypes.USER_TYPE)!! return deserializeAnnotation( ktAnnotation, - userType.classId(), + getAnnotationClassId(ktAnnotation), ((ktAnnotation.stub ?: loadStubByElement(ktAnnotation)) as? KotlinAnnotationEntryStubImpl)?.valueArguments, ktAnnotation.useSiteTarget?.getAnnotationUseSiteTarget() ) } + fun getAnnotationClassId(ktAnnotation: KtAnnotationEntry): ClassId { + val userType = ktAnnotation.getStubOrPsiChild(KtStubElementTypes.CONSTRUCTOR_CALLEE) + ?.getStubOrPsiChild(KtStubElementTypes.TYPE_REFERENCE) + ?.getStubOrPsiChild(KtStubElementTypes.USER_TYPE)!! + return userType.classId() + } + private fun deserializeAnnotation( ktAnnotation: PsiElement, classId: ClassId, diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedClassDeserialization.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedClassDeserialization.kt index 788bce8e3d8..86a85e29188 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedClassDeserialization.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedClassDeserialization.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.fir.declarations.comparators.FirMemberDeclarationCom import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.declarations.utils.* import org.jetbrains.kotlin.fir.deserialization.* +import org.jetbrains.kotlin.fir.resolve.transformers.setLazyPublishedVisibility import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.lexer.KtTokens @@ -236,7 +237,6 @@ internal fun deserializeClassToSymbol( context.annotationDeserializer.loadAnnotations(classOrObject) ) - sourceElement = containerSource replaceDeprecationsProvider(getDeprecationsProvider(session)) @@ -244,5 +244,11 @@ internal fun deserializeClassToSymbol( session.deserializedClassConfigurator?.run { configure(classId) } + + setLazyPublishedVisibility( + hasPublishedApi = classOrObject.annotationEntries.any { context.annotationDeserializer.getAnnotationClassId(it) == StandardClassIds.Annotations.PublishedApi }, + parentProperty = null, + session + ) } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedFirMemberDeserializer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedFirMemberDeserializer.kt index 70985c3088f..f8a2b2cab9f 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedFirMemberDeserializer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/stubBased/deserialization/StubBasedFirMemberDeserializer.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusIm import org.jetbrains.kotlin.fir.declarations.utils.sourceElement import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionStub import org.jetbrains.kotlin.fir.resolve.defaultType +import org.jetbrains.kotlin.fir.resolve.transformers.setLazyPublishedVisibility import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.toEffectiveVisibility @@ -345,6 +346,10 @@ internal class StubBasedFirMemberDeserializer( deprecationsProvider = annotations.getDeprecationsProviderFromAnnotations(c.session, fromJava = false) property.contextReceivers.mapNotNull { it.typeReference() }.mapTo(contextReceivers, ::loadContextReceiver) + }.apply { + setLazyPublishedVisibility(c.session) + this.getter?.setLazyPublishedVisibility(annotations, this, c.session) + this.setter?.setLazyPublishedVisibility(annotations, this, c.session) } } @@ -423,6 +428,8 @@ internal class StubBasedFirMemberDeserializer( this.containerSource = c.containerSource function.contextReceivers.mapNotNull { it.typeReference() }.mapTo(contextReceivers, ::loadContextReceiver) + }.apply { + setLazyPublishedVisibility(c.session) } if (function.mayHaveContract()) { val resolvedDescription = StubBasedFirContractDeserializer(simpleFunction, local.typeDeserializer).loadContract(function) @@ -499,6 +506,7 @@ internal class StubBasedFirMemberDeserializer( contextReceivers.addAll(createContextReceiversForClass(classOrObject)) }.build().apply { containingClassForStaticMemberAttr = c.dispatchReceiver!!.lookupTag + setLazyPublishedVisibility(c.session) } } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirDeclarationForCompiledElementSearcher.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirDeclarationForCompiledElementSearcher.kt index d37990956e6..d34ec0bcf79 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirDeclarationForCompiledElementSearcher.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/FirDeclarationForCompiledElementSearcher.kt @@ -39,6 +39,7 @@ internal class FirDeclarationForCompiledElementSearcher(private val symbolProvid is KtNamedFunction -> findNonLocalFunction(ktDeclaration) is KtProperty -> findNonLocalProperty(ktDeclaration) is KtParameter -> findParameter(ktDeclaration) + is KtPropertyAccessor -> findNonLocalPropertyAccessor(ktDeclaration) else -> errorWithFirSpecificEntries("Unsupported compiled declaration of type", psi = ktDeclaration) } @@ -140,6 +141,13 @@ internal class FirDeclarationForCompiledElementSearcher(private val symbolProvid return propertyCandidate.fir } + private fun findNonLocalPropertyAccessor(declaration: KtPropertyAccessor): FirPropertyAccessor { + val firProperty = findNonLocalProperty(declaration.property) + + return (if (declaration.isGetter) firProperty.getter else firProperty.setter) + ?: errorWithFirSpecificEntries("We should be able to find a symbol for property accessor", psi = declaration) + } + } // Returns a built-in provider for a Kotlin standard library, as built-in declarations are its logical part. diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgument.txt index 1ee1d342d26..3cd196dc8e5 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgument.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Annotation : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] name: R|kotlin/String|): R|Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Annotation.name] name: R|kotlin/String|): R|Annotation| { LAZY_super } - public final [ResolvedTo(STATUS)] val name: R|kotlin/String| = R|/name| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val name: R|kotlin/String| = R|/name| + public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] get(): R|kotlin/String| } @R|Annotation|[Types](name = String(y)) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentList.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentList.txt index 11119f64e51..54518e866f7 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentList.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentList.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentList.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Annotation : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] name: R|kotlin/String|): R|Annotation| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Annotation.name] name: R|kotlin/String|): R|Annotation| { LAZY_super } - public final [ResolvedTo(STATUS)] val name: R|kotlin/String| = R|/name| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val name: R|kotlin/String| = R|/name| + public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] get(): R|kotlin/String| } @R|Annotation|[Types](name = String(y)) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt index 27df340acdf..70e2260ff2b 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt @@ -9,4 +9,4 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationCallExpression.kt [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationVarargArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationVarargArgument.txt index 0d9b08ee5e9..9cac11c88dc 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationVarargArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationVarargArgument.txt @@ -9,4 +9,4 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationVarargArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/Suppress|[Types](names = vararg(String(1), String(2))) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt index 31ff9c6b7cf..3ce2ce7ea70 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt @@ -9,4 +9,4 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationWithArguments.kt [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { - } \ 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 9d7eb925c88..13d0f64692d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnConstructorProperty.txt @@ -9,12 +9,12 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationOnConstructorProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @[Types]() i: R|kotlin/Int|): R|Abc| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=Abc] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/Abc.i] @[Types]() i: R|kotlin/Int|): R|Abc| { super() } - public final [ResolvedTo(STATUS)] var i: R|kotlin/Int| = R|/i| - public [ResolvedTo(STATUS)] get(): R|kotlin/Int| - public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var i: R|kotlin/Int| = R|/i| + public [ResolvedTo(STATUS)] [ContainingClassKey=Abc] get(): R|kotlin/Int| + public [ResolvedTo(STATUS)] [ContainingClassKey=Abc] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.txt index 5819bb29ad2..e5a1bbfa01d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnReturnType.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|kotlin/String|.collectOfType([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] i: R|kotlin/Int|): { ^collectOfType IntegerLiteral(4) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotationInClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotationInClass.txt index 3d3220a95b6..e1ca9da55e1 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotationInClass.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/danglingAnnotationInClass.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] danglingAnnotationInClass.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] class F : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|F| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=F] constructor(): R|F| { 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 3b1b4a9df85..16a7996a2dc 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 @@ -9,17 +9,17 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class MyClass : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @[Types]() addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/MyClass.addCommaWarning] @[Types]() addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| { super() } - public final [ResolvedTo(STATUS)] var addCommaWarning: R|kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(STATUS)] get(): R|kotlin/Boolean| - public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|kotlin/Boolean|): R|kotlin/Unit| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var addCommaWarning: R|kotlin/Boolean| = R|/addCommaWarning| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|kotlin/Boolean| + public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] set([ResolvedTo(STATUS)] value: R|kotlin/Boolean|): R|kotlin/Unit| } public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { 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 8d11c751013..7879b418aab 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt @@ -9,18 +9,18 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class MyClass : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/MyClass.addCommaWarning] addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| { super() } - field:@R|kotlin/jvm/JvmField|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var addCommaWarning: R|kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Boolean| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Boolean|): R|kotlin/Unit| + field:@R|kotlin/jvm/JvmField|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [IsFromPrimaryConstructor=true] var addCommaWarning: R|kotlin/Boolean| = R|/addCommaWarning| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=MyClass] get(): R|kotlin/Boolean| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=MyClass] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Boolean|): R|kotlin/Unit| } public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValue.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValue.txt index 7ce58505dd5..86ff70ba2af 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValue.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValue.txt @@ -9,8 +9,8 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] retentionValue.kt [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Retention|[Types](value = Q|kotlin/annotation/AnnotationRetention|.R|kotlin/annotation/AnnotationRetention.SOURCE|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] annotation class Anno : R|kotlin/Annotation| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Anno| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotation.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotation.txt index 22c9120b8a3..8efeb461fcd 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotation.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotation.txt @@ -9,19 +9,19 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] superCallAnnotation.kt [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } } public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } public final [ResolvedTo(BODY_RESOLVE)] class B : R|@R|Anno|() A| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|B| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=B] constructor(): R|B| { super() } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotation2.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotation2.txt index 4a89fe3c10b..34acb83f718 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotation2.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotation2.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] superCallAnnotation2.kt [ResolvedTo(BODY_RESOLVE)] annotations container @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } @@ -17,7 +17,7 @@ FILE: [ResolvedTo(IMPORTS)] superCallAnnotation2.kt public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| { } public final [ResolvedTo(BODY_RESOLVE)] class B : R|@R|Anno|() A| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|B| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=B] constructor(): R|B| { 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 7289f16701a..a8c1b8bdf07 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt @@ -9,20 +9,20 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { super() } } public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } @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)] constructor(): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } - } \ No newline at end of file + } 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 0224ad78bf9..6eec997e8a6 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt @@ -9,17 +9,17 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpression.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = Boolean(false)): R|ResolveMe| { super() } } @R|kotlin/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)] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super } - public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| - } \ No newline at end of file + } 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 ab1746aa0c4..de1263600dd 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt @@ -9,24 +9,24 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { super() } - public final [ResolvedTo(STATUS)] var addCommaWarning: R|@R|Anno|() kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(STATUS)] get(): R|@R|Anno|() kotlin/Boolean| - public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var addCommaWarning: R|@R|Anno|() kotlin/Boolean| = R|/addCommaWarning| + public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|@R|Anno|() kotlin/Boolean| + public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] set([ResolvedTo(STATUS)] value: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| } public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } @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)] constructor(): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } - } \ No newline at end of file + } 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 91b1bf95b19..010f6156807 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt @@ -9,24 +9,24 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyAndParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false), [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] second: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false), [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] second: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { super() } - public final [ResolvedTo(STATUS)] var addCommaWarning: R|@R|Anno|() kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(STATUS)] get(): R|@R|Anno|() kotlin/Boolean| - public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var addCommaWarning: R|@R|Anno|() kotlin/Boolean| = R|/addCommaWarning| + public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|@R|Anno|() kotlin/Boolean| + public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] set([ResolvedTo(STATUS)] value: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| } public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } @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)] constructor(): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } - } \ No newline at end of file + } 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 b3ab05a8ea1..4127e2cce91 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt @@ -9,27 +9,27 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyWithArguments.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = Boolean(false)): R|ResolveMe| { super() } - public final [ResolvedTo(STATUS)] var addCommaWarning: R|@R|Anno|(String(abc)) kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(STATUS)] get(): R|@R|Anno|(String(abc)) kotlin/Boolean| - public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|@R|Anno|(String(abc)) kotlin/Boolean|): R|kotlin/Unit| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var addCommaWarning: R|@R|Anno|(String(abc)) kotlin/Boolean| = R|/addCommaWarning| + public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] get(): R|@R|Anno|(String(abc)) kotlin/Boolean| + public [ResolvedTo(STATUS)] [ContainingClassKey=ResolveMe] set([ResolvedTo(STATUS)] value: R|@R|Anno|(String(abc)) kotlin/Boolean|): R|kotlin/Unit| } public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } @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)] constructor([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.value] value: R|kotlin/String|): R|Anno| { LAZY_super } - public final [ResolvedTo(STATUS)] val value: R|kotlin/String| = R|/value| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/String| = R|/value| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt index c6f0946e3a4..122c5d87f79 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt @@ -11,14 +11,14 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameter.kt public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun t([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| { } public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } @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)] constructor(): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArguments.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArguments.txt index e36b5e13f3a..840181dd39e 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArguments.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArguments.txt @@ -11,17 +11,17 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArguments.kt public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun t([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(value = String(abcd)) kotlin/Boolean|): R|kotlin/Unit| { } public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|A| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } @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)] constructor([ResolvedTo(STATUS)] value: R|kotlin/String|): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.value] value: R|kotlin/String|): R|Anno| { LAZY_super } - public final [ResolvedTo(STATUS)] val value: R|kotlin/String| = R|/value| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/String| = R|/value| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunction.txt index 2e0ec698507..17b55b2403f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunction.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunction.txt @@ -12,11 +12,11 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverFunction.kt ^check Int(1) } @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)] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super } - public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameter.txt index a9d3d0003fb..dadda7336ed 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameter.txt @@ -12,11 +12,11 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverParameter.kt ^check Int(1) } @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)] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super } - public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverProperty.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverProperty.txt index 3a2941b11db..dc2a26157ae 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverProperty.txt @@ -13,11 +13,11 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverProperty.kt ^ String() } @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)] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super } - public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCall.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCall.txt index 9587a46914a..388259cb749 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCall.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCall.txt @@ -13,11 +13,11 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyCall.kt ^ String() } @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)] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super } - public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunction.txt index 35057265b1a..e9a1720321d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunction.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunction.txt @@ -12,11 +12,11 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnFunction.kt ^check IntegerLiteral(1) } @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)] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super } - public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnProperty.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnProperty.txt index ba9ee3688f8..5bbadf45d76 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnProperty.txt @@ -11,11 +11,11 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnProperty.kt public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val i: R|@R|Anno|(s = String(ab)) kotlin/Int| = Int(1) public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|@R|Anno|(s = String(ab)) kotlin/Int| @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] s: R|kotlin/String|): R|Anno| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super } - public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| + public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegate.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegate.txt index 94d82f228f5..eede1467d1f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegate.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegate.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] delegate.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Ann| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { LAZY_super } } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|X| { + public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super } @@ -23,8 +23,8 @@ FILE: [ResolvedTo(IMPORTS)] delegate.kt ^ Int(1) } ) - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] get(): { ^ this@R|/X|.D|/X.a|.#(this@R|/X|, ::R|/X.a|) } - } \ No newline at end of file + } 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 468f42187ba..5990b7383d3 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 @@ -9,18 +9,18 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] field.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Ann| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { LAZY_super } } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { super() } - field:@FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Int|): R|kotlin/Unit| + field:@FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Int|): R|kotlin/Unit| - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/file.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/file.txt index 38ae40c602a..38883aadd8c 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/file.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/file.txt @@ -10,7 +10,7 @@ FILE: [ResolvedTo(IMPORTS)] file.kt @FILE:R|Ann|[Types]() [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Ann| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { 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 0d7af7fefeb..d722236b3c7 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 @@ -9,18 +9,18 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] getter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Ann| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { LAZY_super } } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { super() } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = R|/x| - @PROPERTY_GETTER:R|Ann|[Types]() public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Int|): R|kotlin/Unit| + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + @PROPERTY_GETTER:R|Ann|[Types]() public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Int|): R|kotlin/Unit| - } \ No newline at end of file + } 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 71074c296e2..bcaa1f92918 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 @@ -9,18 +9,18 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] param.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Ann| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { LAZY_super } } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @CONSTRUCTOR_PARAMETER:R|Ann|[Types]() x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] @CONSTRUCTOR_PARAMETER:R|Ann|[Types]() x: R|kotlin/Int|): R|X| { super() } - public final [ResolvedTo(STATUS)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(STATUS)] get(): R|kotlin/Int| - public [ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(STATUS)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(STATUS)] [ContainingClassKey=X] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| - } \ No newline at end of file + } 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 8fd98034a5d..2a709a876b6 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 @@ -9,18 +9,18 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] property.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Ann| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { LAZY_super } } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { super() } - @PROPERTY:R|Ann|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Int|): R|kotlin/Unit| + @PROPERTY:R|Ann|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Int|): R|kotlin/Unit| - } \ No newline at end of file + } 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 bdbf58d96ea..2cf59d566a0 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 @@ -9,18 +9,18 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] setParam.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Ann| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { LAZY_super } } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { super() } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @SETTER_PARAMETER:R|Ann|[Types]() value: R|kotlin/Int|): R|kotlin/Unit| + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @SETTER_PARAMETER:R|Ann|[Types]() value: R|kotlin/Int|): R|kotlin/Unit| - } \ No newline at end of file + } 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 95aad5bec5f..dab85565058 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 @@ -9,18 +9,18 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] setter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|Ann| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { LAZY_super } } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { super() } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| - @PROPERTY_SETTER:R|Ann|[Types]() public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Int|): R|kotlin/Unit| + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] get(): R|kotlin/Int| + @PROPERTY_SETTER:R|Ann|[Types]() public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: R|kotlin/Int|): R|kotlin/Unit| - } \ No newline at end of file + } 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 cd93bc3f325..0dc3c8419e0 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructor.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallAndExplicitConstructor.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|B| { + public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|B| { LAZY_super } } public final [ResolvedTo(STATUS)] class A : R|B| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): 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/callInsideLambdaInsideSuperCallAndImplicitConstructor.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndImplicitConstructor.txt index 239787819c2..7768953891f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndImplicitConstructor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndImplicitConstructor.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallAndImplicitConstructor.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|B| { + public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|B| { LAZY_super } } public final [ResolvedTo(BODY_RESOLVE)] class A : R|B| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): 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/callInsideLambdaInsideSuperCallFromSecondaryConstructor.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSecondaryConstructor.txt index d0867d19849..4eb682767bb 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSecondaryConstructor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSecondaryConstructor.txt @@ -9,17 +9,17 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallFromSecondaryConstructor.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|A| { LAZY_super } } public final [ResolvedTo(STATUS)] class B : R|A| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|B| { + public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] i: R|kotlin/Int|): R|B| { LAZY_super<> } - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] l: R|kotlin/Long|): R|B| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=B] constructor([ResolvedTo(BODY_RESOLVE)] l: R|kotlin/Long|): R|B| { super([ResolvedTo(RAW_FIR)] fun (): R|kotlin/Unit| { R|/foo|(R|/l|) } 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 3a81d72826f..fac61a80c1b 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSingleSecondaryConstructor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallFromSingleSecondaryConstructor.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallFromSingleSecondaryConstructor.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|A| { LAZY_super } } public final [ResolvedTo(STATUS)] class B : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int|): R|B| { + 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|) } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCall.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCall.txt index e601437d13f..27440f9e602 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCall.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCall.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] constructorDelegationSuperCall.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|B| { + public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|B| { LAZY_super } } public final [ResolvedTo(BODY_RESOLVE)] class A : R|B| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor(): R|A| { super(Int(1)) } 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 f963b66955c..4a068643a0d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationThisCall.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationThisCall.txt @@ -9,11 +9,11 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] constructorDelegationThisCall.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|A| { LAZY_super } - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] y: R|kotlin/String|): R|A| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] constructor([ResolvedTo(BODY_RESOLVE)] y: R|kotlin/String|): R|A| { this(Int(1)) } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/noReceiverOnLambda.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/noReceiverOnLambda.txt index 863630910c1..79130c116e9 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/noReceiverOnLambda.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/noReceiverOnLambda.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] noReceiverOnLambda.kt [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class SomeTest : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|SomeTest| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=SomeTest] constructor(): R|SomeTest| { LAZY_super } 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 2af20386266..3d320bd58ea 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsidePropertyInsideConstructor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsidePropertyInsideConstructor.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsidePropertyInsideConstructor.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] i: R|() -> kotlin/Unit| = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/Unit| { + 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|() } @@ -19,7 +19,7 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsidePropertyInsideConstructor.kt super() } - public final [ResolvedTo(BODY_RESOLVE)] val i: R|() -> kotlin/Unit| = R|/i| - public [ResolvedTo(BODY_RESOLVE)] get(): R|() -> kotlin/Unit| + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|() -> kotlin/Unit| = R|/i| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|() -> kotlin/Unit| } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall.txt index 4ec8a0248d2..4921f53ac74 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall.txt @@ -9,22 +9,22 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| { LAZY_super } public final [ResolvedTo(CONTRACTS)] val prop: R|kotlin/String| = String() - public [ResolvedTo(CONTRACTS)] get(): R|kotlin/String| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] get(): R|kotlin/String| } public final [ResolvedTo(STATUS)] object B : R|A| { - private [ResolvedTo(STATUS)] constructor(): R|B| { + private [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } } public final [ResolvedTo(BODY_RESOLVE)] object C : R|A| { - private [ResolvedTo(BODY_RESOLVE)] constructor(): R|C| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| { super([ResolvedTo(RAW_FIR)] fun R|A|.(): R|kotlin/Unit| { local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| { ^foo Q|B|.R|/A.prop|.R|kotlin/String.toString|() diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall2.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall2.txt index b31c5850e44..722ba56c37a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall2.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall2.txt @@ -9,22 +9,22 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall2.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| { LAZY_super } public final [ResolvedTo(CONTRACTS)] val prop: R|kotlin/String| = String() - public [ResolvedTo(CONTRACTS)] get(): R|kotlin/String| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] get(): R|kotlin/String| } public final [ResolvedTo(STATUS)] object B : R|A| { - private [ResolvedTo(STATUS)] constructor(): R|B| { + private [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } } public final [ResolvedTo(BODY_RESOLVE)] object C : R|A| { - private [ResolvedTo(BODY_RESOLVE)] constructor(): R|C| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| { super([ResolvedTo(RAW_FIR)] fun R|A|.(): R|kotlin/Unit| { local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| { ^foo Q|B|.R|/A.prop|.R|kotlin/String.toString|() 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 13f848e3f89..fa48fc1ac4f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall3.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall3.txt @@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind FIR element rendered: public final [ResolvedTo(BODY_RESOLVE)] object C : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|C| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| { super() } @@ -14,22 +14,22 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall3.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] init: R|A.() -> kotlin/Unit|): R|A| { + public [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [ContainingClassKey=A] constructor([ResolvedTo(EXPECT_ACTUAL_MATCHING)] init: R|A.() -> kotlin/Unit|): R|A| { LAZY_super } public final [ResolvedTo(STATUS)] val prop: R|kotlin/String| = LAZY_EXPRESSION - public [ResolvedTo(STATUS)] get(): R|kotlin/String| + public [ResolvedTo(STATUS)] [ContainingClassKey=A] get(): R|kotlin/String| } public? final? [ResolvedTo(RAW_FIR)] object B : A { - private [ResolvedTo(RAW_FIR)] constructor(): R|B| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } } public final [ResolvedTo(BODY_RESOLVE)] object C : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|C| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| { super() } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall4.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall4.txt index 0b5b0d997c9..b0a19f97cee 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall4.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall4.txt @@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind FIR element rendered: public final [ResolvedTo(BODY_RESOLVE)] class G : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|G| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=G] constructor(): R|G| { super([ResolvedTo(RAW_FIR)] fun R|A|.(): R|kotlin/Unit| { local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| { ^foo Q|C|.R|/A.prop|.R|kotlin/String.toString|() @@ -20,28 +20,28 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall4.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| { LAZY_super } public final [ResolvedTo(CONTRACTS)] val prop: R|kotlin/String| = String() - public [ResolvedTo(CONTRACTS)] get(): R|kotlin/String| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] get(): R|kotlin/String| } public? final? [ResolvedTo(RAW_FIR)] object B : A { - private [ResolvedTo(RAW_FIR)] constructor(): R|B| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } } public final [ResolvedTo(STATUS)] object C : R|A| { - private [ResolvedTo(STATUS)] constructor(): R|C| { + private [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super } } public final [ResolvedTo(BODY_RESOLVE)] class G : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|G| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=G] constructor(): R|G| { super([ResolvedTo(RAW_FIR)] fun R|A|.(): R|kotlin/Unit| { local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| { ^foo Q|C|.R|/A.prop|.R|kotlin/String.toString|() 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 b08042d551f..1fb980cc60f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall5.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCall5.txt @@ -9,28 +9,28 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCall5.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| { LAZY_super } public final [ResolvedTo(CONTRACTS)] val prop: R|kotlin/String| = String() - public [ResolvedTo(CONTRACTS)] get(): R|kotlin/String| + public [ResolvedTo(CONTRACTS)] [ContainingClassKey=A] get(): R|kotlin/String| } public? final? [ResolvedTo(RAW_FIR)] object B : A { - private [ResolvedTo(RAW_FIR)] constructor(): R|B| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } } public final [ResolvedTo(STATUS)] object C : R|A| { - private [ResolvedTo(STATUS)] constructor(): R|C| { + private [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super } } public final [ResolvedTo(STATUS)] class G : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|G| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=G] constructor(): R|G| { super([ResolvedTo(RAW_FIR)] fun R|A|.(): R|kotlin/Unit| { local final [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/String| { ^foo Q|C|.R|/A.prop|.R|kotlin/String.toString|() diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallSelector.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallSelector.txt index 1dc93fda3f9..c3addc8716a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallSelector.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallSelector.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedCallSelector.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] object A : R|kotlin/Any| { - private [ResolvedTo(STATUS)] constructor(): R|A| { + private [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedWholeCall.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedWholeCall.txt index 8f9e4f91ec2..d6be6ab5e81 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedWholeCall.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedWholeCall.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedWholeCall.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] object A : R|kotlin/Any| { - private [ResolvedTo(STATUS)] constructor(): R|A| { + private [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperator.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperator.txt index fa01ce2bc78..f49df8a484a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperator.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperator.txt @@ -11,12 +11,12 @@ FILE: [ResolvedTo(IMPORTS)] setOperator.kt package test public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] n: R|kotlin/Int|): R|test/B| { + public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=test/B.n] n: R|kotlin/Int|): R|test/B| { LAZY_super } - public final [ResolvedTo(STATUS)] val n: R|kotlin/Int| = R|/n| - public [ResolvedTo(STATUS)] get(): R|kotlin/Int| + public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val n: R|kotlin/Int| = R|/n| + public [ResolvedTo(STATUS)] [ContainingClassKey=B] get(): R|kotlin/Int| public final operator [ResolvedTo(CONTRACTS)] fun set([ResolvedTo(CONTRACTS)] i: R|kotlin/Int|, [ResolvedTo(CONTRACTS)] a: R|test/B|): R|kotlin/Unit| { } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/superType.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/superType.txt index 6a12eb46b68..713fd93bb10 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/superType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/superType.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] superType.kt public abstract [ResolvedTo(STATUS)] interface A : R|kotlin/Any| { } public final [ResolvedTo(BODY_RESOLVE)] class C : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|C| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=C] constructor(): R|C| { super() } 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 101fe327a63..d9c958bea56 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/constructorProperty.txt @@ -3,17 +3,17 @@ FIR element: FirValueParameterImpl FIR source kind: KtRealSourceElementKind FIR element rendered: -[ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int| = Int(4) +[ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Abc.i] i: R|kotlin/Int| = Int(4) FIR FILE: FILE: [ResolvedTo(IMPORTS)] constructorProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int| = Int(4)): R|Abc| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/Abc.i] i: R|kotlin/Int| = Int(4)): R|Abc| { super() } - public final [ResolvedTo(BODY_RESOLVE)] val i: R|kotlin/Int| = R|/i| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val i: R|kotlin/Int| = R|/i| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Abc] get(): R|kotlin/Int| } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/ktij23263.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/ktij23263.txt index d8044c3db08..1447baa0635 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/ktij23263.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/ktij23263.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] ktij23263.kt [ResolvedTo(BODY_RESOLVE)] annotations container public? final? [ResolvedTo(RAW_FIR)] class InitOrderDemo : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor([ResolvedTo(RAW_FIR)] name: String): R|InitOrderDemo| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=InitOrderDemo] constructor([ResolvedTo(RAW_FIR)] name: String): R|InitOrderDemo| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteral.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteral.txt index 7931f8089c2..2967beff83e 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteral.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteral.txt @@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind FIR element rendered: object : R|kotlin/Any| { - private [ResolvedTo(BODY_RESOLVE)] constructor(): R|| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] constructor(): R|| { super() } @@ -15,7 +15,7 @@ FILE: [ResolvedTo(IMPORTS)] objectLiteral.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun test(): R|kotlin/Unit| { object : R|kotlin/Any| { - private [ResolvedTo(BODY_RESOLVE)] constructor(): R|| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] constructor(): R|| { super() } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpression.txt index 227aece47f1..e0294ee650a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/objectLiteralExpression.txt @@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind FIR element rendered: object : R|kotlin/Any| { - private [ResolvedTo(BODY_RESOLVE)] constructor(): R|| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] constructor(): R|| { super() } @@ -15,7 +15,7 @@ FILE: [ResolvedTo(IMPORTS)] objectLiteralExpression.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun test(): R|kotlin/Unit| { object : R|kotlin/Any| { - private [ResolvedTo(BODY_RESOLVE)] constructor(): R|| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] constructor(): R|| { super() } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.txt index 6f07a4ca9db..1967674a6a7 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegate.txt @@ -3,7 +3,7 @@ FIR element: FirFunctionCallImpl FIR source kind: KtRealSourceElementKind FIR element rendered: -R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { +R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0] lazy@fun (): R|kotlin/Int| { ^ Int(1) } ) @@ -11,7 +11,7 @@ R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] lazy@fun () FIR FILE: FILE: [ResolvedTo(IMPORTS)] propertyDelegate.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int|by R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { + public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int|by R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0] lazy@fun (): R|kotlin/Int| { ^ Int(1) } ) diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.txt index eb45c3a1d54..0742695919b 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/propertyDelegateExpression.txt @@ -3,7 +3,7 @@ FIR element: FirFunctionCallImpl FIR source kind: KtRealSourceElementKind FIR element rendered: -R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { +R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0] lazy@fun (): R|kotlin/Int| { ^ Int(1) } ) @@ -11,7 +11,7 @@ R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] lazy@fun () FIR FILE: FILE: [ResolvedTo(IMPORTS)] propertyDelegateExpression.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int|by R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { + public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int|by R|kotlin/lazy|( = [ResolvedTo(RAW_FIR)] [MatchingParameterFunctionTypeKey=kotlin/Function0] lazy@fun (): R|kotlin/Int| { ^ Int(1) } ) diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/insidePlusAssignTarget.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/insidePlusAssignTarget.txt index be0aaa74bf5..c713b2db47a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/insidePlusAssignTarget.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/insidePlusAssignTarget.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] insidePlusAssignTarget.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/collections/MutableMap>|): R|kotlin/Unit| { - R|/x|.R|kotlin/collections/getOrPut||>(Int(1), = [ResolvedTo(BODY_RESOLVE)] getOrPut@fun (): R|kotlin/collections/MutableList| { + R|/x|.R|kotlin/collections/getOrPut||>(Int(1), = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=kotlin/Function0] getOrPut@fun (): R|kotlin/collections/MutableList| { ^ R|kotlin/collections/mutableListOf|() } ).R|kotlin/collections/plusAssign|(String(str)) diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.txt index c9f9ccc8d23..4e3f44251c4 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/lambdaExpression.txt @@ -3,14 +3,14 @@ FIR element: FirAnonymousFunctionExpressionImpl FIR source kind: KtRealSourceElementKind FIR element rendered: -[ResolvedTo(BODY_RESOLVE)] run@fun (): R|kotlin/Int| { +[ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=kotlin/Function0] run@fun (): R|kotlin/Int| { ^ Int(1) } FIR FILE: FILE: [ResolvedTo(IMPORTS)] lambdaExpression.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| = R|kotlin/run|( = [ResolvedTo(BODY_RESOLVE)] run@fun (): R|kotlin/Int| { + public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| = R|kotlin/run|( = [ResolvedTo(BODY_RESOLVE)] [MatchingParameterFunctionTypeKey=kotlin/Function0] run@fun (): R|kotlin/Int| { ^ Int(1) } ) diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpression.txt index 63cd0d48142..6f8774a513b 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/objectLiteralExpression.txt @@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind FIR element rendered: object : R|kotlin/Any| { - private [ResolvedTo(BODY_RESOLVE)] constructor(): R|| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] constructor(): R|| { super() } @@ -14,7 +14,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] objectLiteralExpression.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Any| = object : R|kotlin/Any| { - private [ResolvedTo(BODY_RESOLVE)] constructor(): R|| { + private [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] constructor(): R|| { super() } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/propertyReferenceExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/propertyReferenceExpression.txt index cec85bae8a9..8de3736cc77 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/propertyReferenceExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/propertyReferenceExpression.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] propertyReferenceExpression.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpression.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpression.txt index 500d0903e2b..52d1859cb53 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/tryExpression.txt @@ -6,7 +6,7 @@ FIR element rendered: try { Int(1) } -catch ([ResolvedTo(BODY_RESOLVE)] e: R|kotlin/Throwable|) { +catch ([ResolvedTo(BODY_RESOLVE)] [IsCatchParameterProperty=true] e: R|kotlin/Throwable|) { } finally { } @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] tryExpression.kt try { Int(1) } - catch ([ResolvedTo(BODY_RESOLVE)] e: R|kotlin/Throwable|) { + catch ([ResolvedTo(BODY_RESOLVE)] [IsCatchParameterProperty=true] e: R|kotlin/Throwable|) { } finally { } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/duplicatedClasses.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/duplicatedClasses.txt index 48eded41976..24fc297b00f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/duplicatedClasses.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/duplicatedClasses.txt @@ -10,20 +10,20 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] duplicatedClasses.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class SomeClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|SomeClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=SomeClass] constructor(): R|SomeClass| { LAZY_super } public final [ResolvedTo(STATUS)] val prop: = LAZY_EXPRESSION - public [ResolvedTo(STATUS)] get(): + public [ResolvedTo(STATUS)] [ContainingClassKey=SomeClass] get(): } public final [ResolvedTo(STATUS)] class SomeClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|SomeClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=SomeClass] constructor(): R|SomeClass| { LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/duplicatedClassesFunctionParameter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/duplicatedClassesFunctionParameter.txt index ddc6ccfa5fc..ac662112c9d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/duplicatedClassesFunctionParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/duplicatedClassesFunctionParameter.txt @@ -9,20 +9,20 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] duplicatedClassesFunctionParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class SomeClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|SomeClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=SomeClass] constructor(): R|SomeClass| { LAZY_super } public final [ResolvedTo(STATUS)] val prop: = LAZY_EXPRESSION - public [ResolvedTo(STATUS)] get(): + public [ResolvedTo(STATUS)] [ContainingClassKey=SomeClass] get(): } public final [ResolvedTo(STATUS)] class SomeClass : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|SomeClass| { + public [ResolvedTo(STATUS)] [ContainingClassKey=SomeClass] constructor(): R|SomeClass| { LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] p: R|kotlin/Int|): R|kotlin/Unit| { } - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/incompletePropertyWithAnnotation.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/incompletePropertyWithAnnotation.txt index 3fe21bdaab0..189c19caba1 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/incompletePropertyWithAnnotation.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/incompletePropertyWithAnnotation.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] incompletePropertyWithAnnotation.kt [ResolvedTo(BODY_RESOLVE)] annotations container @[Types]() private final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var : private [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): - private [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: ): R|kotlin/Unit| \ No newline at end of file + private [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] value: ): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/secondaryConstructor.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/secondaryConstructor.txt index 0f3c1ea5771..80e5ffd90b6 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/secondaryConstructor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/secondaryConstructor.txt @@ -9,12 +9,12 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructor.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] annotation class JsQualifier : R|kotlin/Annotation|, R|kotlin/Annotation| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|JsQualifier| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=JsQualifier] constructor(): R|JsQualifier| { super() } public final [ResolvedTo(BODY_RESOLVE)] val value: R|kotlin/String| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=JsQualifier] get(): R|kotlin/String| public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Unit| { # diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClasses.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClasses.txt index 3299da69d18..e76e0aa7f71 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClasses.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClasses.txt @@ -9,22 +9,22 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] firstPartOfQualifiedCallWithNestedClasses.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A.B| { + public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|A.B| { LAZY_super } public final [ResolvedTo(STATUS)] class C : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A.B.C| { + public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|A.B.C| { LAZY_super } public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val x: R|kotlin/Int| = Int(10) - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=C] get(): R|kotlin/Int| } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/lastPartOfQualifiedCallWithNestedClasses.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/lastPartOfQualifiedCallWithNestedClasses.txt index 7cbae6d5124..ebb23b40a9a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/lastPartOfQualifiedCallWithNestedClasses.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/lastPartOfQualifiedCallWithNestedClasses.txt @@ -9,22 +9,22 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] lastPartOfQualifiedCallWithNestedClasses.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A.B| { + public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|A.B| { LAZY_super } public final [ResolvedTo(STATUS)] class C : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A.B.C| { + public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|A.B.C| { LAZY_super } public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val x: R|kotlin/Int| = Int(10) - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=C] get(): R|kotlin/Int| } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/middlePartOfQualifiedCallWithNestedClasses.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/middlePartOfQualifiedCallWithNestedClasses.txt index 916091390fc..a0aea4c389d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/middlePartOfQualifiedCallWithNestedClasses.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/middlePartOfQualifiedCallWithNestedClasses.txt @@ -9,22 +9,22 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] middlePartOfQualifiedCallWithNestedClasses.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A.B| { + public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|A.B| { LAZY_super } public final [ResolvedTo(STATUS)] class C : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A.B.C| { + public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|A.B.C| { LAZY_super } public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val x: R|kotlin/Int| = Int(10) - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=C] get(): R|kotlin/Int| } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolved.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolved.txt index 19f6b86437c..08bb0301611 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolved.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolved.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedPartOfQualifiedCallUnresolved.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class FF : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|FF| { + public [ResolvedTo(STATUS)] [ContainingClassKey=FF] constructor(): R|FF| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallWithNestedClasses.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallWithNestedClasses.txt index 443cca84350..f6ed48aaa1c 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallWithNestedClasses.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallWithNestedClasses.txt @@ -9,22 +9,22 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] qualifiedPartOfQualifiedCallWithNestedClasses.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A.B| { + public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|A.B| { LAZY_super } public final [ResolvedTo(STATUS)] class C : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|A.B.C| { + public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|A.B.C| { LAZY_super } public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val x: R|kotlin/Int| = Int(10) - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=C] get(): R|kotlin/Int| } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalType.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalType.txt index 0a4767199ae..5bd6971f1dd 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalType.txt @@ -13,4 +13,4 @@ FILE: [ResolvedTo(IMPORTS)] functionalType.kt String() } - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeArgument.txt index f0d47f7dca4..83553cc2f9d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeArgument.txt @@ -13,4 +13,4 @@ FILE: [ResolvedTo(IMPORTS)] functionalTypeArgument.kt ^ Unit } - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCount.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCount.txt index 34e6f70932a..b8edfc9d0d2 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCount.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCount.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCount.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountArgument.txt index 06631fcb007..5da24da3c78 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountArgument.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCountArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountFirstArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountFirstArgument.txt index 24707a9c41f..b1288e223f1 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountFirstArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountFirstArgument.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCountFirstArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountLastArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountLastArgument.txt index a60772b9f5e..1f3ac6ae8f9 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountLastArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountLastArgument.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCountLastArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassType.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassType.txt index 168cd1b144c..eb4cda4ce99 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassType.txt @@ -9,12 +9,12 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] nestedClassType.kt [ResolvedTo(BODY_RESOLVE)] annotations container public open [ResolvedTo(STATUS)] class Foo : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|Foo| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| { LAZY_super } public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] constructor(): R|Foo.Nested| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor(): R|Foo.Nested| { LAZY_super } @@ -22,11 +22,11 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassType.kt } public final [ResolvedTo(STATUS)] class Bar : R|Foo| { - public [ResolvedTo(STATUS)] constructor(): R|Bar| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| { LAZY_super } public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun create(): R|Foo.Nested| { } - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedTypeArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedTypeArgument.txt index b7a3d9da8cd..418bba74639 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedTypeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedTypeArgument.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] nestedTypeArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/collections/Map>| { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableType.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableType.txt index 343f576447d..cb760e22b3d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableType.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] nullableType.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Int?| { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeWithooutQuestionMark.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeWithooutQuestionMark.txt index 06490fb0fdd..f175a3fdbcc 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeWithooutQuestionMark.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeWithooutQuestionMark.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] nullableTypeWithooutQuestionMark.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Int?| { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverType.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverType.txt index ad9a839a2bc..2e611355a10 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverType.txt @@ -11,8 +11,8 @@ FILE: [ResolvedTo(IMPORTS)] receiverType.kt public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <@R|A|[Types]() [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T> R|T|.test(): R|kotlin/Unit| { } @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public final [ResolvedTo(STATUS)] annotation class A : R|kotlin/Annotation| { - public [ResolvedTo(STATUS)] constructor(): R|A| { + public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeArgument.txt index f7aee238bc0..5cc21ada889 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeArgument.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] typeArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/collections/Map>| { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBound.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBound.txt index 08a6a282d15..737a166f334 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBound.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBound.txt @@ -9,4 +9,4 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeParameterBound.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T : R|kotlin/Number|> check([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] t: R|T|): R|kotlin/Unit| { - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBoundNested.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBoundNested.txt index 1c0f88f938a..15b1466bd5b 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBoundNested.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBoundNested.txt @@ -9,4 +9,4 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeParameterBoundNested.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <[ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T : R|kotlin/collections/List>|> check([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] t: R|T|): R|kotlin/Unit| { - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeArgumentResolvedTypeConsturctor.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeArgumentResolvedTypeConsturctor.txt index c9099afcd7f..3bebd5acda4 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeArgumentResolvedTypeConsturctor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeArgumentResolvedTypeConsturctor.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] unresolvedTypeArgumentResolvedTypeConsturctor.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/collections/List| { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedNestedTypeArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedNestedTypeArgument.txt index ca90ee62599..237d49c3e21 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedNestedTypeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedNestedTypeArgument.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] unresolvedTypeConsturctorResolvedNestedTypeArgument. [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedTypeArgument.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedTypeArgument.txt index 445cebd581e..0374c4f204f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedTypeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedTypeArgument.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] unresolvedTypeConsturctorResolvedTypeArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeType.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeType.txt index 4e0df5274c7..80a0981f2f6 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeType.txt @@ -10,4 +10,4 @@ FILE: [ResolvedTo(IMPORTS)] wholeType.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/collections/Map>| { ^x IntegerLiteral(1) - } \ No newline at end of file + } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeter.txt index 61e777ba132..9743ce684b3 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/classTypeParemeter.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] classTypeParemeter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] class X<[ResolvedTo(BODY_RESOLVE)] T> : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor<[ResolvedTo(BODY_RESOLVE)] T>(): R|X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor<[ResolvedTo(BODY_RESOLVE)] T>(): R|X| { super() } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntry.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntry.txt index aa28dfe014c..9abe297c935 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntry.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntry.txt @@ -3,24 +3,24 @@ FIR element: FirEnumEntryImpl FIR source kind: KtRealSourceElementKind FIR element rendered: -public final static [ResolvedTo(BODY_RESOLVE)] enum entry ENTRY: R|X| +public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] enum entry ENTRY: R|X| FIR FILE: FILE: [ResolvedTo(IMPORTS)] enumEntry.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { - private [ResolvedTo(STATUS)] constructor(): R|X| { + private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { LAZY_super|> } - public final static [ResolvedTo(BODY_RESOLVE)] enum entry ENTRY: R|X| - public final static [ResolvedTo(STATUS)] fun values(): R|kotlin/Array| { + public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] enum entry ENTRY: R|X| + public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun values(): R|kotlin/Array| { } - public final static [ResolvedTo(STATUS)] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| { + public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] fun valueOf([ResolvedTo(STATUS)] value: R|kotlin/String|): R|X| { } - public final static [ResolvedTo(STATUS)] val entries: R|kotlin/enums/EnumEntries| + public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] val entries: R|kotlin/enums/EnumEntries| public [ResolvedTo(STATUS)] get(): R|kotlin/enums/EnumEntries| } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClass.txt index 64d48ea998e..47965901304 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClass.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/localClass.txt @@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind FIR element rendered: local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|X| { super() } @@ -17,7 +17,7 @@ FILE: [ResolvedTo(IMPORTS)] localClass.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] fun y(): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|X| { super() } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunction.txt index 7e6e786f99a..b3df8719938 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunction.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunction.txt @@ -11,7 +11,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] memberFunction.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|Y| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberProperty.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberProperty.txt index 1329ce07dfe..291f4f0b4d6 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberProperty.txt @@ -4,17 +4,17 @@ FIR source kind: KtRealSourceElementKind FIR element rendered: public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/String| = String() - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Y] get(): R|kotlin/String| FIR FILE: FILE: [ResolvedTo(IMPORTS)] memberProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|Y| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| { LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/String| = String() - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Y] get(): R|kotlin/String| } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAlias.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAlias.txt index 7bdb98ab33f..ae4e245460b 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAlias.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAlias.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] memberTypeAlias.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|Y| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClass.txt index 2479a575551..b119d6e2a81 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClass.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClass.txt @@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind FIR element rendered: public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Y.X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|Y.X| { super() } @@ -16,12 +16,12 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] nestedClass.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor(): R|Y| { + public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| { LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Y.X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|Y.X| { 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 c1c20ec9397..eb49051952b 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValValueParameter.txt @@ -3,17 +3,17 @@ FIR element: FirValueParameterImpl FIR source kind: KtRealSourceElementKind FIR element rendered: -[ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int| +[ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/X.x] x: R|kotlin/Int| FIR FILE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorValValueParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { super() } - public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| = R|/x| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| + public final [ResolvedTo(BODY_RESOLVE)] [IsFromPrimaryConstructor=true] val x: R|kotlin/Int| = R|/x| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] get(): R|kotlin/Int| } 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 912fb316952..65e8a380d0c 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/primaryConstructorValueParameter.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] primaryConstructorValueParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|X| { super() } 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 0c59e89ae03..e1f574a8865 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameter.txt @@ -9,11 +9,11 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] secondaryConstructorValueParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(STATUS)] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|X| { LAZY_super } - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] y: R|kotlin/String|): R|X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] y: R|kotlin/String|): R|X| { this(Int(1)) } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelClass.txt index 01d63335441..856e71e493e 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelClass.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/topLevelClass.txt @@ -4,7 +4,7 @@ FIR source kind: KtRealSourceElementKind FIR element rendered: public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|X| { super() } @@ -16,7 +16,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] topLevelClass.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor(): R|X| { super() } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/enumEntry.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/enumEntry.txt index 5b4cb8ca27d..4971a8f147f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/enumEntry.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/enumEntry.txt @@ -5,4 +5,4 @@ FIR element: FirEnumEntryImpl FIR source kind: KtRealSourceElementKind FIR element rendered: -public final static [ResolvedTo(BODY_RESOLVE)] enum entry Baz: R|FooBar| \ No newline at end of file +public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=FooBar] enum entry Baz: R|FooBar| \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiClass.kt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiClass.kt new file mode 100644 index 00000000000..09e098f3ce5 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiClass.kt @@ -0,0 +1,3 @@ +// DECLARATION_TYPE: org.jetbrains.kotlin.psi.KtClass +@PublishedApi +internal class Foo \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiClass.txt new file mode 100644 index 00000000000..de74b0df943 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiClass.txt @@ -0,0 +1,12 @@ +KT element: KtClass +KT element text: +@kotlin.PublishedApi internal final class Foo public constructor() { +} +FIR element: FirRegularClassImpl +FIR source kind: KtRealSourceElementKind + +FIR element rendered: +@R|kotlin/PublishedApi|() internal final [ResolvedTo(BODY_RESOLVE)] [LazyPublishedApiEffectiveVisibilityKey=public] class Foo : R|kotlin/Any| { + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] constructor(): R|Foo| + +} diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiConstructor.kt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiConstructor.kt new file mode 100644 index 00000000000..b86b8ee60c3 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiConstructor.kt @@ -0,0 +1,5 @@ +// DECLARATION_TYPE: org.jetbrains.kotlin.psi.KtConstructor +@PublishedApi +internal class Foo { + @PublishedApi internal constructor() {} +} \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiConstructor.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiConstructor.txt new file mode 100644 index 00000000000..398b2dd35f8 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiConstructor.txt @@ -0,0 +1,8 @@ +KT element: KtSecondaryConstructor +KT element text: +@kotlin.PublishedApi internal constructor() { /* compiled code */ } +FIR element: FirConstructorImpl +FIR source kind: KtRealSourceElementKind + +FIR element rendered: +@R|kotlin/PublishedApi|() internal [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo, LazyPublishedApiEffectiveVisibilityKey=public] constructor(): R|Foo| \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiFunction.kt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiFunction.kt new file mode 100644 index 00000000000..d6e1190505b --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiFunction.kt @@ -0,0 +1,3 @@ +// DECLARATION_TYPE: org.jetbrains.kotlin.psi.KtFunction +@PublishedApi +internal fun published() = "OK" \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiFunction.txt new file mode 100644 index 00000000000..c96617600e8 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiFunction.txt @@ -0,0 +1,8 @@ +KT element: KtNamedFunction +KT element text: +@kotlin.PublishedApi internal fun published(): kotlin.String { /* compiled code */ } +FIR element: FirSimpleFunctionImpl +FIR source kind: KtRealSourceElementKind + +FIR element rendered: +@R|kotlin/PublishedApi|() internal final [ResolvedTo(BODY_RESOLVE)] [LazyPublishedApiEffectiveVisibilityKey=public] fun published(): R|kotlin/String| \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPrimaryConstructor.kt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPrimaryConstructor.kt new file mode 100644 index 00000000000..6ff3c1e033e --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPrimaryConstructor.kt @@ -0,0 +1,4 @@ +// DECLARATION_TYPE: org.jetbrains.kotlin.psi.KtPrimaryConstructor +@PublishedApi +internal class Foo @PublishedApi internal constructor(val foo: String) { +} \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPrimaryConstructor.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPrimaryConstructor.txt new file mode 100644 index 00000000000..f2fb31a2091 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPrimaryConstructor.txt @@ -0,0 +1,8 @@ +KT element: KtPrimaryConstructor +KT element text: +@kotlin.PublishedApi internal constructor(foo: kotlin.String) +FIR element: FirPrimaryConstructor +FIR source kind: KtRealSourceElementKind + +FIR element rendered: +@R|kotlin/PublishedApi|() internal [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo, LazyPublishedApiEffectiveVisibilityKey=public] constructor([ResolvedTo(BODY_RESOLVE)] foo: R|kotlin/String|): R|Foo| \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiProperty.kt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiProperty.kt new file mode 100644 index 00000000000..cfa6a09baf4 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiProperty.kt @@ -0,0 +1,3 @@ +// DECLARATION_TYPE: org.jetbrains.kotlin.psi.KtProperty +@PublishedApi +internal val published = "OK" \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiProperty.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiProperty.txt new file mode 100644 index 00000000000..d6f7619d5bd --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiProperty.txt @@ -0,0 +1,8 @@ +KT element: KtProperty +KT element text: +@kotlin.PublishedApi internal val published: kotlin.String /* compiled code */ +FIR element: FirPropertyImpl +FIR source kind: KtRealSourceElementKind + +FIR element rendered: +@R|kotlin/PublishedApi|() internal final [ResolvedTo(BODY_RESOLVE)] [LazyPublishedApiEffectiveVisibilityKey=public] val published: R|kotlin/String| \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertyGetter.kt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertyGetter.kt new file mode 100644 index 00000000000..110c5a684fa --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertyGetter.kt @@ -0,0 +1,3 @@ +// DECLARATION_TYPE: org.jetbrains.kotlin.psi.KtPropertyAccessor +@PublishedApi +internal val published get() = "OK" \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertyGetter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertyGetter.txt new file mode 100644 index 00000000000..6937086ca62 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertyGetter.txt @@ -0,0 +1,8 @@ +KT element: KtPropertyAccessor +KT element text: +internal final get +FIR element: FirPropertyAccessorImpl +FIR source kind: KtRealSourceElementKind + +FIR element rendered: +internal [ResolvedTo(BODY_RESOLVE)] [LazyPublishedApiEffectiveVisibilityKey=public] get(): R|kotlin/String| \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertySetter.kt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertySetter.kt new file mode 100644 index 00000000000..73d02714374 --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertySetter.kt @@ -0,0 +1,4 @@ +// DECLARATION_TYPE: org.jetbrains.kotlin.psi.KtPropertyAccessor +@PublishedApi +internal var published = "OK" + set(value) {} \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertySetter.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertySetter.txt new file mode 100644 index 00000000000..bc53ba0f68f --- /dev/null +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertySetter.txt @@ -0,0 +1,8 @@ +KT element: KtPropertyAccessor +KT element text: +internal final set(value: kotlin.String) {/* compiled code */ } +FIR element: FirPropertyAccessorImpl +FIR source kind: KtRealSourceElementKind + +FIR element rendered: +internal [ResolvedTo(BODY_RESOLVE)] [LazyPublishedApiEffectiveVisibilityKey=public] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|kotlin/Unit| \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/secondaryConstructor.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/secondaryConstructor.txt index f5672701cd1..9a8f21a3fa6 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/secondaryConstructor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/secondaryConstructor.txt @@ -5,4 +5,4 @@ FIR element: FirConstructorImpl FIR source kind: KtRealSourceElementKind FIR element rendered: -public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] p: R|kotlin/String|): R|FooBar| \ No newline at end of file +public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=FooBar] constructor([ResolvedTo(BODY_RESOLVE)] p: R|kotlin/String|): R|FooBar| \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/simpleClass.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/simpleClass.txt index 273d9bbf9c5..717ae019f5f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/simpleClass.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/simpleClass.txt @@ -10,6 +10,6 @@ FIR element rendered: public final [ResolvedTo(BODY_RESOLVE)] class FooBar : R|kotlin/Any| { public final [ResolvedTo(BODY_RESOLVE)] fun doSmth(): R|kotlin/Unit| - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|FooBar| + public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=FooBar] constructor(): R|FooBar| } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/simpleConstructor.txt b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/simpleConstructor.txt index 238c04a4048..85f5fe56d36 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/simpleConstructor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFirBinary/simpleConstructor.txt @@ -5,4 +5,4 @@ FIR element: FirPrimaryConstructor FIR source kind: KtRealSourceElementKind FIR element rendered: -public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] p: R|kotlin/String|): R|FooBar| \ No newline at end of file +public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=FooBar] constructor([ResolvedTo(BODY_RESOLVE)] p: R|kotlin/String|): R|FooBar| \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTestCase.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTestCase.kt index 7870c1645ca..fc2c781d22c 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTestCase.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractFirLazyDeclarationResolveTestCase.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.renderer.FirDeclarationRendererWithAttributes +import org.jetbrains.kotlin.fir.renderer.FirDeclarationRendererWithFilteredAttributes import org.jetbrains.kotlin.fir.renderer.FirErrorExpressionExtendedRenderer import org.jetbrains.kotlin.fir.renderer.FirFileAnnotationsContainerRenderer import org.jetbrains.kotlin.fir.renderer.FirRenderer @@ -40,7 +40,7 @@ abstract class AbstractFirLazyDeclarationResolveTestCase : AbstractLowLevelApiSi val resultBuilder = StringBuilder() val renderer = FirRenderer( builder = resultBuilder, - declarationRenderer = FirDeclarationRendererWithAttributes(), + declarationRenderer = FirDeclarationRendererWithFilteredAttributes(), resolvePhaseRenderer = FirResolvePhaseRenderer(), errorExpressionRenderer = FirErrorExpressionExtendedRenderer(), fileAnnotationsContainerRenderer = FirFileAnnotationsContainerRenderer(), diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt index 099734e9be3..87cfbec5c44 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt @@ -14,10 +14,7 @@ import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerPro import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirImport -import org.jetbrains.kotlin.fir.renderer.FirFileAnnotationsContainerRenderer -import org.jetbrains.kotlin.fir.renderer.FirPackageDirectiveRenderer -import org.jetbrains.kotlin.fir.renderer.FirRenderer -import org.jetbrains.kotlin.fir.renderer.FirResolvePhaseRenderer +import org.jetbrains.kotlin.fir.renderer.* import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.services.TestModuleStructure @@ -61,6 +58,7 @@ private fun render(firElement: FirElement?): String = when (firElement) { fileAnnotationsContainerRenderer = FirFileAnnotationsContainerRenderer(), packageDirectiveRenderer = FirPackageDirectiveRenderer(), resolvePhaseRenderer = FirResolvePhaseRenderer(), + declarationRenderer = FirDeclarationRendererWithFilteredAttributes(), ).renderElementAsString(firElement) } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractLibraryGetOrBuildFirTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractLibraryGetOrBuildFirTest.kt index 5c200d9029b..efaf3f59888 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractLibraryGetOrBuildFirTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractLibraryGetOrBuildFirTest.kt @@ -44,13 +44,13 @@ abstract class AbstractLibraryGetOrBuildFirTest : AbstractLowLevelApiSingleFileT private fun getElementToSearch(ktFile: KtFile, moduleStructure: TestModuleStructure): KtDeclaration { val expectedType = moduleStructure.allDirectives[Directives.DECLARATION_TYPE].firstOrNull() ?: error("Compiled code should have element type specified") - @Suppress("UNCHECKED_CAST") val expectedClass = Class.forName(expectedType) as Class + @Suppress("UNCHECKED_CAST") val expectedClass = Class.forName(expectedType) as Class return findFirstDeclaration(ktFile.declarations, expectedClass)!! } private fun findFirstDeclaration( declarations: List, - expectedClass: Class + expectedClass: Class ): KtDeclaration? { declarations.filterIsInstance(expectedClass).firstOrNull()?.let { return it as KtDeclaration } declarations.forEach { decl -> @@ -60,7 +60,10 @@ abstract class AbstractLibraryGetOrBuildFirTest : AbstractLowLevelApiSingleFileT if (decl is KtFunction) { findFirstDeclaration(decl.valueParameters, expectedClass)?.let { return it } } - if (decl is KtClass && expectedClass == KtConstructor::class.java) { + if (decl is KtProperty) { + findFirstDeclaration(decl.accessors, expectedClass)?.let { return it } + } + if (decl is KtClass && KtConstructor::class.java.isAssignableFrom(expectedClass)) { decl.primaryConstructor?.let { return it } } } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/LibraryGetOrBuildFirTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/LibraryGetOrBuildFirTestGenerated.java index 7f2ec8f4f6a..552d3bebe6a 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/LibraryGetOrBuildFirTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/LibraryGetOrBuildFirTestGenerated.java @@ -77,4 +77,56 @@ public class LibraryGetOrBuildFirTestGenerated extends AbstractLibraryGetOrBuild public void testTopLevelFunction() throws Exception { runTest("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/topLevelFunction.kt"); } + + @Nested + @TestMetadata("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi") + @TestDataPath("$PROJECT_ROOT") + public class PublishedApi { + @Test + public void testAllFilesPresentInPublishedApi() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi"), Pattern.compile("^(.+)\\.kt$"), null, true); + } + + @Test + @TestMetadata("publishedApiClass.kt") + public void testPublishedApiClass() throws Exception { + runTest("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiClass.kt"); + } + + @Test + @TestMetadata("publishedApiConstructor.kt") + public void testPublishedApiConstructor() throws Exception { + runTest("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiConstructor.kt"); + } + + @Test + @TestMetadata("publishedApiFunction.kt") + public void testPublishedApiFunction() throws Exception { + runTest("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiFunction.kt"); + } + + @Test + @TestMetadata("publishedApiPrimaryConstructor.kt") + public void testPublishedApiPrimaryConstructor() throws Exception { + runTest("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPrimaryConstructor.kt"); + } + + @Test + @TestMetadata("publishedApiProperty.kt") + public void testPublishedApiProperty() throws Exception { + runTest("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiProperty.kt"); + } + + @Test + @TestMetadata("publishedApiPropertyGetter.kt") + public void testPublishedApiPropertyGetter() throws Exception { + runTest("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertyGetter.kt"); + } + + @Test + @TestMetadata("publishedApiPropertySetter.kt") + public void testPublishedApiPropertySetter() throws Exception { + runTest("analysis/low-level-api-fir/testdata/getOrBuildFirBinary/publishedApi/publishedApiPropertySetter.kt"); + } + } }