From 87ca9e42033482555406df06ff9cfb26d2d7c1e6 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Tue, 13 Jun 2023 16:22:59 +0200 Subject: [PATCH] [LL FIR] reduce resolution inside getOrBuildFirFor We can avoid body resolution in some cases because it is more than out contract is required So ANNOTATIONS_ARGUMENTS_MAPPING should be enough for all non-body parts of a declaration to return fully-resolved FirElement Body parts incudes: body and default values ^KT-59266 Fixed --- .../level/api/fir/api/LLFirResolveSession.kt | 8 +- .../fir/element/builder/FirElementBuilder.kt | 142 +++++++++++++++++- .../annotationApplicationArgument.txt | 4 +- .../annotationApplicationArgumentList.txt | 4 +- .../annotationApplicationCallExpression.txt | 4 +- .../annotationApplicationVarargArgument.txt | 4 +- .../annotationApplicationWithArguments.txt | 4 +- .../annotationOnConstructorProperty.txt | 10 +- ...nnotationOnReturnType.out_of_src_roots.txt | 4 +- .../annotations/annotationOnReturnType.txt | 6 +- ...OnConstructorProperty.out_of_src_roots.txt | 8 +- ...vmFieldAnnotationOnConstructorProperty.txt | 10 +- .../annotations/retentionValue.txt | 8 +- ...typeOnAnnotationOnConstructorParameter.txt | 4 +- ...tationOnConstructorParameterExpression.txt | 4 +- .../typeOnAnnotationOnConstructorProperty.txt | 10 +- ...ationOnConstructorPropertyAndParameter.txt | 10 +- ...tionOnConstructorPropertyWithArguments.txt | 10 +- .../typeOnAnnotationOnFunctionParameter.txt | 4 +- ...tationOnFunctionParameterWithArguments.txt | 4 +- .../typeOnAnnotationOnReceiverFunction.txt | 4 +- .../typeOnAnnotationOnReceiverParameter.txt | 4 +- .../typeOnAnnotationOnReceiverProperty.txt | 6 +- ...typeOnAnnotationOnReceiverPropertyCall.txt | 6 +- .../typeOnAnnotationOnReturnFunction.txt | 6 +- .../typeOnAnnotationOnReturnProperty.txt | 6 +- .../annotations/useSite/delegate.txt | 6 +- .../annotations/useSite/field.txt | 10 +- .../annotations/useSite/getter.txt | 10 +- .../annotations/useSite/param.txt | 10 +- .../annotations/useSite/property.txt | 10 +- .../annotations/useSite/setParam.txt | 10 +- .../annotations/useSite/setter.txt | 10 +- .../incompletePropertyWithAnnotation.txt | 6 +- .../getOrBuildFir/types/functionalType.txt | 8 +- .../types/functionalTypeArgument.txt | 6 +- .../types/invalidTypeArgumentsCount.txt | 6 +- .../invalidTypeArgumentsCountArgument.txt | 6 +- ...invalidTypeArgumentsCountFirstArgument.txt | 6 +- .../invalidTypeArgumentsCountLastArgument.txt | 6 +- .../getOrBuildFir/types/nestedClassType.txt | 4 +- .../types/nestedTypeArgument.txt | 6 +- .../getOrBuildFir/types/nullableType.txt | 6 +- .../nullableTypeWithooutQuestionMark.txt | 6 +- .../getOrBuildFir/types/receiverType.txt | 2 +- .../getOrBuildFir/types/typeArgument.txt | 6 +- .../types/typeParameterBound.txt | 4 +- .../types/typeParameterBoundNested.txt | 4 +- ...vedTypeArgumentResolvedTypeConsturctor.txt | 6 +- ...eConsturctorResolvedNestedTypeArgument.txt | 6 +- ...vedTypeConsturctorResolvedTypeArgument.txt | 6 +- .../getOrBuildFir/types/wholeType.txt | 6 +- .../localFunctionInsideAnnotationCall.txt | 78 +++++----- 53 files changed, 341 insertions(+), 203 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirResolveSession.kt index d324ebf0172..b26e76a3bc4 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirResolveSession.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirResolveSession.kt @@ -38,9 +38,11 @@ abstract class LLFirResolveSession { abstract fun getScopeSessionFor(firSession: FirSession): ScopeSession /** - * Build fully resolved FIR node for requested element. - * This operation could be performance affective because it create FIleStructureElement and resolve non-local declaration into BODY phase, use - * @see tryGetCachedFirFile to get [FirFile] in undefined phase + * Build fully resolved FIR node for a requested element. + * This operation could be time-consuming because it creates FileStructureElement + * and resolves non-local declaration into BODY phase. + * Please use [getOrBuildFirFile] to get [FirFile] in undefined phase + * @see getOrBuildFirFile */ internal abstract fun getOrBuildFirFor(element: KtElement): FirElement? diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirElementBuilder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirElementBuilder.kt index e58330e38d9..970c1e27484 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirElementBuilder.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/element/builder/FirElementBuilder.kt @@ -11,12 +11,30 @@ import org.jetbrains.kotlin.analysis.api.impl.barebone.annotations.ThreadSafe import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirModuleResolveComponents import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.FileStructureElement +import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.FirElementsRecorder +import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.KtToFirMapping import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.declarationCanBeLazilyResolved +import org.jetbrains.kotlin.analysis.low.level.api.fir.util.findSourceNonLocalFirDeclaration import org.jetbrains.kotlin.analysis.utils.printer.getElementTextInContext +import org.jetbrains.kotlin.analysis.utils.printer.parentOfType +import org.jetbrains.kotlin.analysis.utils.printer.parentsOfType +import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.correspondingProperty +import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration +import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile +import org.jetbrains.kotlin.fir.declarations.FirProperty +import org.jetbrains.kotlin.fir.declarations.FirReceiverParameter import org.jetbrains.kotlin.fir.declarations.FirResolvePhase +import org.jetbrains.kotlin.fir.declarations.FirTypeParameter +import org.jetbrains.kotlin.fir.declarations.FirValueParameter +import org.jetbrains.kotlin.fir.declarations.utils.correspondingValueParameterFromPrimaryConstructor +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.psi +import org.jetbrains.kotlin.fir.resolve.providers.firProvider import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase +import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.kotlin.psi.psiUtil.isObjectLiteral @@ -78,16 +96,134 @@ internal class FirElementBuilder( return null } + getOrBuildFirForElementInsideAnnotations(element, firResolveSession)?.let { return it } + getOrBuildFirForElementInsideTypes(element, firResolveSession)?.let { return it } + + val psi = getPsiAsFirElementSource(element) ?: return null val firFile = element.containingKtFile val fileStructure = moduleComponents.fileStructureCache.getFileStructure(firFile) val structureElement = fileStructure.getStructureElementFor(element) - val psi = getPsiAsFirElementSource(element) ?: return null val mappings = structureElement.mappings - return mappings.getFirOfClosestParent(psi) - ?: firResolveSession.getOrBuildFirFile(firFile) + return mappings.getFirOfClosestParent(psi) ?: firResolveSession.getOrBuildFirFile(firFile) } + private inline fun getOrBuildFirForNonBodyElement( + element: KtElement, + firResolveSession: LLFirResolveSession, + anchorElementProvider: (KtElement) -> T?, + declarationProvider: (T) -> KtDeclaration?, + resolveAndFindFirForAnchor: (FirDeclaration, T) -> FirElement?, + ): FirElement? { + val anchorElement = anchorElementProvider(element) ?: return null + val declaration = declarationProvider(anchorElement) ?: return null + val nonLocalDeclaration = declaration.getNonLocalContainingOrThisDeclaration() + if (declaration != nonLocalDeclaration) return null + + val firDeclaration = nonLocalDeclaration.findSourceNonLocalFirDeclaration( + firFileBuilder = moduleComponents.firFileBuilder, + provider = firResolveSession.useSiteFirSession.firProvider, + ) + + val anchorFir = resolveAndFindFirForAnchor(firDeclaration, anchorElement) ?: return null + // We use identity comparison here intentionally to check that it is exactly the object we want to find + if (element === anchorElement) return anchorFir + + return findElementInside(firElement = anchorFir, element = element, stopAt = anchorElement) + } + + private fun KtAnnotationEntry.owner(): KtDeclaration? { + val parent = parent + val modifierList = parent as? KtModifierList ?: (parent as? KtAnnotation)?.parent as? KtModifierList ?: return null + return modifierList.owner as? KtDeclaration + } + + private fun getOrBuildFirForElementInsideAnnotations( + element: KtElement, + firResolveSession: LLFirResolveSession, + ): FirElement? = getOrBuildFirForNonBodyElement( + element = element, + firResolveSession = firResolveSession, + anchorElementProvider = { it.parentOfType(withSelf = true) }, + declarationProvider = { it.owner() }, + resolveAndFindFirForAnchor = { declaration, anchor -> declaration.resolveAndFindAnnotation(anchor, goDeep = true) }, + ) + + private fun getOrBuildFirForElementInsideTypes( + element: KtElement, + firResolveSession: LLFirResolveSession, + ): FirElement? = getOrBuildFirForNonBodyElement( + element = element, + firResolveSession = firResolveSession, + anchorElementProvider = { it.parentsOfType(withSelf = true).lastOrNull() }, + declarationProvider = { it.parent as? KtDeclaration }, + resolveAndFindFirForAnchor = { declaration, anchor -> declaration.resolveAndFindTypeRefAnchor(anchor) }, + )?.let { firElement -> + if (firElement is FirReceiverParameter) { + firElement.typeRef + } else { + firElement + } + } + + private fun findElementInside(firElement: FirElement, element: KtElement, stopAt: PsiElement): FirElement? { + val elementToSearch = getPsiAsFirElementSource(element) ?: return null + val mapping = FirElementsRecorder.recordElementsFrom(firElement, FirElementsRecorder()) + + var current: PsiElement? = elementToSearch + while (current != null && current != stopAt && current !is KtFile) { + if (current is KtElement) { + mapping[current]?.let { return it } + } + + current = current.parent + } + + return firElement + } + + private fun FirDeclaration.resolveAndFindTypeRefAnchor(typeReference: KtTypeReference): FirElement? { + lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) + + if (this is FirCallableDeclaration) { + returnTypeRef.takeIf { it.psi == typeReference }?.let { return it } + receiverParameter?.takeIf { it.typeRef.psi == typeReference }?.let { return it } + } + + if (this is FirTypeParameter) { + for (typeRef in bounds) { + if (typeRef.psi == typeReference) { + return typeRef + } + } + } + + return null + } + + private fun FirDeclaration.resolveAndFindAnnotation(annotationEntry: KtAnnotationEntry, goDeep: Boolean = false): FirAnnotation? { + lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) + findAnnotation(annotationEntry)?.let { return it } + + if (this is FirProperty) { + backingField?.findAnnotation(annotationEntry)?.let { return it } + getter?.findAnnotation(annotationEntry)?.let { return it } + setter?.findAnnotation(annotationEntry)?.let { return it } + setter?.valueParameters?.first()?.findAnnotation(annotationEntry)?.let { return it } + } + + return when { + !goDeep -> null + this is FirProperty -> correspondingValueParameterFromPrimaryConstructor?.fir?.resolveAndFindAnnotation(annotationEntry) + this is FirValueParameter -> correspondingProperty?.resolveAndFindAnnotation(annotationEntry) + else -> null + } + } + + private fun FirAnnotationContainer.findAnnotation( + annotationEntry: KtAnnotationEntry, + ): FirAnnotation? = annotations.find { it.psi == annotationEntry } + @TestOnly fun getStructureElementFor(element: KtElement): FileStructureElement { val fileStructure = moduleComponents.fileStructureCache.getFileStructure(element.containingKtFile) 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 5c47cead3c5..1ee1d342d26 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgument.txt @@ -17,5 +17,5 @@ FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgument.kt public [ResolvedTo(STATUS)] get(): R|kotlin/String| } - @R|Annotation|[Types](name = String(y)) public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { - } + @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 b5b4eeb02d6..11119f64e51 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentList.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentList.txt @@ -17,5 +17,5 @@ FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentList.kt public [ResolvedTo(STATUS)] get(): R|kotlin/String| } - @R|Annotation|[Types](name = String(y)) public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { - } + @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 0b548389955..27df340acdf 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationCallExpression.txt @@ -8,5 +8,5 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationCallExpression.kt [ResolvedTo(BODY_RESOLVE)] annotations container - @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { - } + @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 dd569f2dff0..0d9b08ee5e9 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationVarargArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationVarargArgument.txt @@ -8,5 +8,5 @@ String(2) 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(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { - } + @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 12c19ac5bce..31ff9c6b7cf 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationWithArguments.txt @@ -8,5 +8,5 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationWithArguments.kt [ResolvedTo(BODY_RESOLVE)] annotations container - @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { - } + @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 a2877208357..9d7eb925c88 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(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] @[Types]() i: R|kotlin/Int|): R|Abc| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @[Types]() i: R|kotlin/Int|): R|Abc| { super() } - public final [ResolvedTo(BODY_RESOLVE)] var i: R|kotlin/Int| = R|/i| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| + 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| - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.out_of_src_roots.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.out_of_src_roots.txt index 6192fc913d9..72830488c12 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.out_of_src_roots.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.out_of_src_roots.txt @@ -8,6 +8,6 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationOnReturnType.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun R|kotlin/String|.collectOfType([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int|): { - ^collectOfType Int(4) + 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/annotationOnReturnType.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.txt index a3fd2da32d2..5819bb29ad2 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationOnReturnType.txt @@ -8,6 +8,6 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationOnReturnType.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun R|kotlin/String|.collectOfType([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/Int|): { - ^collectOfType Int(4) - } + 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/jvmFieldAnnotationOnConstructorProperty.out_of_src_roots.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.out_of_src_roots.txt index 3f0b64d7ebb..3b1b4a9df85 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,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class MyClass : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] @[Types]() addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @[Types]() addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| { super() } - public final [ResolvedTo(BODY_RESOLVE)] var addCommaWarning: R|kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Boolean| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Boolean|): R|kotlin/Unit| + 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 open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { 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 6067e3ae430..8d11c751013 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class MyClass : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|kotlin/Boolean| = Boolean(false)): R|MyClass| { super() } - field:@R|kotlin/jvm/JvmField|[Types]() public final [ResolvedTo(BODY_RESOLVE)] var addCommaWarning: R|kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Boolean| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Boolean|): R|kotlin/Unit| + 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| } public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { @@ -23,4 +23,4 @@ FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt 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 911232b8411..7ce58505dd5 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValue.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValue.txt @@ -8,9 +8,9 @@ R|kotlin/annotation/AnnotationRetention.SOURCE| 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(BODY_RESOLVE)] annotation class Anno : R|kotlin/Annotation| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Anno| { - super() + @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| { + LAZY_super } - } + } \ No newline at end of file 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 03f4a45046f..7289f16701a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { super() } @@ -25,4 +25,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameter.kt 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 5f72cbc1ed7..0224ad78bf9 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpression.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = Boolean(false)): R|ResolveMe| { super() } @@ -22,4 +22,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpression.kt public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| public [ResolvedTo(STATUS)] 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 208b60c4b46..ab1746aa0c4 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { super() } - public final [ResolvedTo(BODY_RESOLVE)] var addCommaWarning: R|@R|Anno|() kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(BODY_RESOLVE)] get(): R|@R|Anno|() kotlin/Boolean| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| + 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 open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { @@ -29,4 +29,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorProperty.kt 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 cdd1ee55366..91b1bf95b19 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyAndParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = Boolean(false), [ResolvedTo(BODY_RESOLVE)] second: R|@R|Anno|() kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + 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| { super() } - public final [ResolvedTo(BODY_RESOLVE)] var addCommaWarning: R|@R|Anno|() kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(BODY_RESOLVE)] get(): R|@R|Anno|() kotlin/Boolean| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| + 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 open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { @@ -29,4 +29,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyAndParameter.kt 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 e16d2bd592d..b3ab05a8ea1 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt @@ -9,13 +9,13 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyWithArguments.kt [ResolvedTo(BODY_RESOLVE)] annotations container public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = Boolean(false)): R|ResolveMe| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = Boolean(false)): R|ResolveMe| { super() } - public final [ResolvedTo(BODY_RESOLVE)] var addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = R|/addCommaWarning| - public [ResolvedTo(BODY_RESOLVE)] get(): R|@R|Anno|(value = String(abc)) kotlin/Boolean| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|(value = String(abc)) kotlin/Boolean|): R|kotlin/Unit| + 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 open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { @@ -32,4 +32,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyWithArguments.k public final [ResolvedTo(STATUS)] val value: R|kotlin/String| = R|/value| public [ResolvedTo(STATUS)] 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 3c208b38c33..c6f0946e3a4 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun t([ResolvedTo(BODY_RESOLVE)] addCommaWarning: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| { + 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| { @@ -21,4 +21,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameter.kt 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 712b025338f..e36b5e13f3a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArguments.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArguments.txt @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArguments.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun t([ResolvedTo(BODY_RESOLVE)] addCommaWarning: R|@R|Anno|(value = String(abcd)) kotlin/Boolean|): R|kotlin/Unit| { + 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| { @@ -24,4 +24,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArguments.kt public final [ResolvedTo(STATUS)] val value: R|kotlin/String| = R|/value| public [ResolvedTo(STATUS)] 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 c592d8b8b65..2e0ec698507 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunction.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunction.txt @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverFunction.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun R|@R|Anno|(s = String(ab)) kotlin/Int|.check(): R|kotlin/Int| { + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|@R|Anno|(s = String(ab)) kotlin/Int|.check(): R|kotlin/Int| { ^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| { @@ -19,4 +19,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverFunction.kt public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| public [ResolvedTo(STATUS)] 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 389c2d4b291..a9d3d0003fb 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameter.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameter.txt @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverParameter.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun @RECEIVER:R|Anno|[Types](s = String(ab)) R|kotlin/Int|.check(): R|kotlin/Int| { + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun @RECEIVER:R|Anno|[Types](s = String(ab)) R|kotlin/Int|.check(): R|kotlin/Int| { ^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| { @@ -19,4 +19,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverParameter.kt public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| public [ResolvedTo(STATUS)] 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 912b0982abc..3a2941b11db 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverProperty.txt @@ -8,8 +8,8 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] val R|@R|Anno|(s = String(a)) kotlin/Int|.i: R|kotlin/String| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| { + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val R|@R|Anno|(s = String(a)) kotlin/Int|.i: R|kotlin/String| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/String| { ^ 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| { @@ -20,4 +20,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverProperty.kt public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| public [ResolvedTo(STATUS)] 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 990c30d7f5c..9587a46914a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCall.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCall.txt @@ -8,8 +8,8 @@ R|Anno| FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyCall.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] val R|@R|Anno|(s = String(a)) kotlin/Int|.i: R|kotlin/String| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/String| { + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val R|@R|Anno|(s = String(a)) kotlin/Int|.i: R|kotlin/String| + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/String| { ^ 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| { @@ -20,4 +20,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyCall.kt public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| public [ResolvedTo(STATUS)] 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 9667e22bcf9..35057265b1a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunction.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunction.txt @@ -8,8 +8,8 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnFunction.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun check(): R|@R|Anno|(s = String(ab)) kotlin/Int| { - ^check Int(1) + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun check(): R|@R|Anno|(s = String(ab)) kotlin/Int| { + ^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| { @@ -19,4 +19,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnFunction.kt public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| public [ResolvedTo(STATUS)] 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 342c2756216..ba9ee3688f8 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnProperty.txt @@ -8,8 +8,8 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnProperty.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] val i: R|@R|Anno|(s = String(ab)) kotlin/Int| = Int(1) - public [ResolvedTo(BODY_RESOLVE)] get(): R|@R|Anno|(s = String(ab)) kotlin/Int| + 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| { LAZY_super @@ -18,4 +18,4 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnProperty.kt public final [ResolvedTo(STATUS)] val s: R|kotlin/String| = R|/s| public [ResolvedTo(STATUS)] 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 c6d8c8eea07..94d82f228f5 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 @@ -19,12 +19,12 @@ FILE: [ResolvedTo(IMPORTS)] delegate.kt LAZY_super } - field:@PROPERTY_DELEGATE_FIELD:R|Ann|[Types]() public final [ResolvedTo(BODY_RESOLVE)] val a: by #( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { + field:@PROPERTY_DELEGATE_FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val a: by #( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { ^ Int(1) } ) - public [ResolvedTo(BODY_RESOLVE)] get(): { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] 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 8318a54e25b..468f42187ba 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 @@ -15,12 +15,12 @@ FILE: [ResolvedTo(IMPORTS)] field.kt } 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(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { super() } - field:@FIELD:R|Ann|[Types]() public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| + 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| - } + } \ No newline at end of file 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 9d74087c624..0d7af7fefeb 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 @@ -15,12 +15,12 @@ FILE: [ResolvedTo(IMPORTS)] getter.kt } 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(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { super() } - public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = R|/x| - @PROPERTY_GETTER:R|Ann|[Types]() public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| + 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| - } + } \ 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 23e38b128c1..71074c296e2 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 @@ -15,12 +15,12 @@ FILE: [ResolvedTo(IMPORTS)] param.kt } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] @CONSTRUCTOR_PARAMETER:R|Ann|[Types]() x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] @CONSTRUCTOR_PARAMETER:R|Ann|[Types]() x: R|kotlin/Int|): R|X| { super() } - public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| + 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| - } + } \ 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 05fffd8ed4a..8fd98034a5d 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 @@ -15,12 +15,12 @@ FILE: [ResolvedTo(IMPORTS)] property.kt } 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(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { super() } - @PROPERTY:R|Ann|[Types]() public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| + @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| - } + } \ 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 905ba93fecc..bdbf58d96ea 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 @@ -15,12 +15,12 @@ FILE: [ResolvedTo(IMPORTS)] setParam.kt } 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(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { super() } - public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|Ann|[Types]() value: R|kotlin/Int|): R|kotlin/Unit| + 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| - } + } \ 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 b856adfd30a..95aad5bec5f 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 @@ -15,12 +15,12 @@ FILE: [ResolvedTo(IMPORTS)] setter.kt } 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(ANNOTATIONS_ARGUMENTS_MAPPING)] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] x: R|kotlin/Int|): R|X| { super() } - public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = R|/x| - public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - @PROPERTY_SETTER:R|Ann|[Types]() public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| + 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| - } + } \ 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 c709a853e7b..3fe21bdaab0 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/incompletePropertyWithAnnotation.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/invalidCode/incompletePropertyWithAnnotation.txt @@ -8,6 +8,6 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] incompletePropertyWithAnnotation.kt [ResolvedTo(BODY_RESOLVE)] annotations container - @[Types]() private final [ResolvedTo(BODY_RESOLVE)] var : - private [ResolvedTo(BODY_RESOLVE)] get(): - private [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: ): R|kotlin/Unit| + @[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 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 1064948fb95..0a4767199ae 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalType.txt @@ -8,9 +8,9 @@ R|(kotlin/Int) -> kotlin/String| FIR FILE: FILE: [ResolvedTo(IMPORTS)] functionalType.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|(kotlin/Int) -> kotlin/String| { - ^x [ResolvedTo(BODY_RESOLVE)] fun ([ResolvedTo(BODY_RESOLVE)] it: R|kotlin/Int|): R|kotlin/String| { - ^ String() + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|(kotlin/Int) -> kotlin/String| { + ^x [ResolvedTo(RAW_FIR)] fun .(): { + 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 661dede06f5..f0d47f7dca4 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/functionalTypeArgument.txt @@ -8,9 +8,9 @@ R|kotlin/Int| FIR FILE: FILE: [ResolvedTo(IMPORTS)] functionalTypeArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|(kotlin/Int) -> kotlin/String| { - ^x [ResolvedTo(BODY_RESOLVE)] fun ([ResolvedTo(BODY_RESOLVE)] it: R|kotlin/Int|): R|kotlin/Unit| { + public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|(kotlin/Int) -> kotlin/String| { + ^x [ResolvedTo(RAW_FIR)] fun .(): { ^ 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 71bb7b71535..34e6f70932a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCount.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCount.txt @@ -8,6 +8,6 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCount.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): { - ^x Int(1) - } + 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 fee40a910f4..06631fcb007 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountArgument.txt @@ -8,6 +8,6 @@ R|kotlin/String| FIR FILE: FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCountArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): { - ^x Int(1) - } + 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 e22d9666140..24707a9c41f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountFirstArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountFirstArgument.txt @@ -8,6 +8,6 @@ R|kotlin/String| FIR FILE: FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCountFirstArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): { - ^x Int(1) - } + 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 a6caab5cb85..a60772b9f5e 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountLastArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/invalidTypeArgumentsCountLastArgument.txt @@ -8,6 +8,6 @@ R|kotlin/String| FIR FILE: FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCountLastArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): { - ^x Int(1) - } + 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 7fd0b3facfc..168cd1b144c 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassType.txt @@ -26,7 +26,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassType.kt LAZY_super } - public final [ResolvedTo(BODY_RESOLVE)] fun create(): R|Foo.Nested| { + 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 e6358b6b20b..b7a3d9da8cd 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedTypeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedTypeArgument.txt @@ -8,6 +8,6 @@ R|kotlin/Int| FIR FILE: FILE: [ResolvedTo(IMPORTS)] nestedTypeArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/collections/Map>| { - ^x Int(1) - } + 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 36619db79e6..343f576447d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableType.txt @@ -8,6 +8,6 @@ R|kotlin/Int?| FIR FILE: FILE: [ResolvedTo(IMPORTS)] nullableType.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Int?| { - ^x Int(1) - } + 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 e282809f98a..06490fb0fdd 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeWithooutQuestionMark.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nullableTypeWithooutQuestionMark.txt @@ -8,6 +8,6 @@ R|kotlin/Int?| FIR FILE: FILE: [ResolvedTo(IMPORTS)] nullableTypeWithooutQuestionMark.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Int?| { - ^x Int(1) - } + 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 6e5cbbfe5dd..ad9a839a2bc 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverType.txt @@ -8,7 +8,7 @@ R|T| FIR FILE: FILE: [ResolvedTo(IMPORTS)] receiverType.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun <@R|A|[Types]() [ResolvedTo(BODY_RESOLVE)] T> R|T|.test(): R|kotlin/Unit| { + 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| { 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 43d4b7613bb..f7aee238bc0 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeArgument.txt @@ -8,6 +8,6 @@ R|kotlin/collections/List| FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/collections/Map>| { - ^x Int(1) - } + 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 8740fda3014..08a6a282d15 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBound.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBound.txt @@ -8,5 +8,5 @@ R|kotlin/Number| FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeParameterBound.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/Number|> check([ResolvedTo(BODY_RESOLVE)] t: R|T|): R|kotlin/Unit| { - } + 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 666284f6ba5..1c0f88f938a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBoundNested.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/typeParameterBoundNested.txt @@ -8,5 +8,5 @@ R|kotlin/Int| FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeParameterBoundNested.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/collections/List>|> check([ResolvedTo(BODY_RESOLVE)] t: R|T|): R|kotlin/Unit| { - } + 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 3fdb5bdae01..c9099afcd7f 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeArgumentResolvedTypeConsturctor.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeArgumentResolvedTypeConsturctor.txt @@ -8,6 +8,6 @@ R|kotlin/collections/List| FIR FILE: FILE: [ResolvedTo(IMPORTS)] unresolvedTypeArgumentResolvedTypeConsturctor.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/collections/List| { - ^x Int(1) - } + 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 f592fd64c7d..ca90ee62599 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedNestedTypeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedNestedTypeArgument.txt @@ -8,6 +8,6 @@ R|kotlin/Int| FIR FILE: FILE: [ResolvedTo(IMPORTS)] unresolvedTypeConsturctorResolvedNestedTypeArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): { - ^x Int(1) - } + 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 fff65def035..445cebd581e 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedTypeArgument.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/unresolvedTypeConsturctorResolvedTypeArgument.txt @@ -8,6 +8,6 @@ R|kotlin/collections/List| FIR FILE: FILE: [ResolvedTo(IMPORTS)] unresolvedTypeConsturctorResolvedTypeArgument.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): { - ^x Int(1) - } + 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 b74560f8ba3..4e0df5274c7 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeType.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/wholeType.txt @@ -8,6 +8,6 @@ R|kotlin/collections/Map>| FIR FILE: FILE: [ResolvedTo(IMPORTS)] wholeType.kt [ResolvedTo(BODY_RESOLVE)] annotations container - public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/collections/Map>| { - ^x Int(1) - } + 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/lazyResolve/localFunctionInsideAnnotationCall.txt b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCall.txt index c8252982eb7..419736bd34e 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCall.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/localFunctionInsideAnnotationCall.txt @@ -12,9 +12,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -33,9 +33,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -54,9 +54,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -75,9 +75,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -96,9 +96,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -117,9 +117,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -138,9 +138,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -159,9 +159,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -180,9 +180,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -201,9 +201,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -222,9 +222,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -243,9 +243,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } } @@ -264,9 +264,9 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideAnnotationCall.kt } @R|one/Anno|[Types](s = [ResolvedTo(RAW_FIR)] fun (): R|kotlin/String| { } - .R|SubstitutionOverride|()) public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { - super() + .R|SubstitutionOverride|()) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class TopLevelClass : R|kotlin/Any| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { + LAZY_super } }