diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt index 62e737d64c9..ae6b23d11ec 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt @@ -32,7 +32,7 @@ internal class KtFirAnnotationListForType private constructor( ) : KtAnnotationsList() { override val annotations: List get() = withValidityAssertion { - coneType.customAnnotationsWithLazyResolve(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING).mapIndexed { index, annotation -> + coneType.customAnnotationsWithLazyResolve(FirResolvePhase.ANNOTATION_ARGUMENTS).mapIndexed { index, annotation -> annotation.toKtAnnotationApplication(useSiteSession, index) } } @@ -54,7 +54,7 @@ internal class KtFirAnnotationListForType private constructor( classId: ClassId, useSiteTargetFilter: AnnotationUseSiteTargetFilter, ): List = withValidityAssertion { - coneType.customAnnotationsWithLazyResolve(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING).mapIndexedNotNull { index, annotation -> + coneType.customAnnotationsWithLazyResolve(FirResolvePhase.ANNOTATION_ARGUMENTS).mapIndexedNotNull { index, annotation -> if (!useSiteTargetFilter.isAllowed(annotation.useSiteTarget) || annotation.toAnnotationClassId(useSiteSession) != classId) { return@mapIndexedNotNull null } @@ -90,7 +90,7 @@ private fun ConeKotlinType.customAnnotationsWithLazyResolve(phase: FirResolvePha for (containerSymbol in custom.containerSymbols) { when (phase) { FirResolvePhase.TYPES -> resolveAnnotationsWithClassIds(containerSymbol) - FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING -> annotations.resolveAnnotationsWithArguments(containerSymbol) + FirResolvePhase.ANNOTATION_ARGUMENTS -> annotations.resolveAnnotationsWithArguments(containerSymbol) else -> {} } } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt index 91c76173fd8..c61a45573ba 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt @@ -47,12 +47,12 @@ internal fun annotationsByClassId( useSiteSession: FirSession, annotationContainer: FirAnnotationContainer = firSymbol.fir, ): List = - if (classId == StandardClassIds.Annotations.Target && firSymbol.fir.resolvePhase < FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) { + if (classId == StandardClassIds.Annotations.Target && firSymbol.fir.resolvePhase < FirResolvePhase.ANNOTATION_ARGUMENTS) { annotationContainer.resolvedAnnotationsWithClassIds(firSymbol) .mapIndexedToAnnotationApplication(useSiteTargetFilter, useSiteSession, classId) { index, annotation -> annotation.asKtAnnotationApplicationForTargetAnnotation(useSiteSession, index) } - } else if (classId == JvmStandardClassIds.Annotations.Java.Target && firSymbol.fir.resolvePhase < FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) { + } else if (classId == JvmStandardClassIds.Annotations.Java.Target && firSymbol.fir.resolvePhase < FirResolvePhase.ANNOTATION_ARGUMENTS) { annotationContainer.resolvedAnnotationsWithClassIds(firSymbol) .mapIndexedToAnnotationApplication(useSiteTargetFilter, useSiteSession, classId) { index, annotation -> annotation.asKtAnnotationApplicationForJavaTargetAnnotation(useSiteSession, index) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMetadataCalculator.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMetadataCalculator.kt index 539f8790c23..e803ecb1008 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMetadataCalculator.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMetadataCalculator.kt @@ -93,7 +93,7 @@ internal class KtFirMetadataCalculator(override val analysisSession: KtFirAnalys for (fir in declarations) { if (fir !is FirFunction && fir !is FirProperty && fir !is FirTypeAlias) continue - fir.symbol.lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) + fir.symbol.lazyResolveToPhase(FirResolvePhase.ANNOTATION_ARGUMENTS) val psiElements = mapping[fir.psi as KtElement] val methods = psiElements.filterIsInstance() diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt index 6c873fde7a3..07cf3caab57 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacadeForResolveOnAir.kt @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.util.errorWithFirSpecific import org.jetbrains.kotlin.analysis.low.level.api.fir.util.isScriptStatement import org.jetbrains.kotlin.analysis.low.level.api.fir.util.originalDeclaration import org.jetbrains.kotlin.analysis.low.level.api.fir.util.originalKtFile -import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment import org.jetbrains.kotlin.analysis.utils.printer.parentOfType import org.jetbrains.kotlin.analysis.utils.printer.parentsOfType import org.jetbrains.kotlin.fir.FirElement @@ -46,6 +45,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf +import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment import org.jetbrains.kotlin.utils.exceptions.withPsiEntry object LowLevelFirApiFacadeForResolveOnAir { @@ -433,7 +433,7 @@ object LowLevelFirApiFacadeForResolveOnAir { return when { container !is KtDeclaration -> FirResolvePhase.BODY_RESOLVE bodyResolveRequired(container, elementToReplace) -> FirResolvePhase.BODY_RESOLVE - annotationMappingRequired(container, elementToReplace) -> FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING + annotationMappingRequired(container, elementToReplace) -> FirResolvePhase.ANNOTATION_ARGUMENTS else -> { /** Currently it is a minimal phase there we can collect [FirResolveContextCollector] */ FirResolvePhase.CONTRACTS 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 e3718983eb3..4e19ade561b 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 @@ -194,7 +194,7 @@ internal class FirElementBuilder( } private fun FirDeclaration.resolveAndFindTypeRefAnchor(typeReference: KtTypeReference): FirElement? { - lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) + lazyResolveToPhase(FirResolvePhase.ANNOTATION_ARGUMENTS) if (this is FirCallableDeclaration) { returnTypeRef.takeIf { it.psi == typeReference }?.let { return it } @@ -221,7 +221,7 @@ internal class FirElementBuilder( } private fun FirDeclaration.resolveAndFindAnnotation(annotationEntry: KtAnnotationEntry, goDeep: Boolean = false): FirAnnotation? { - lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) + lazyResolveToPhase(FirResolvePhase.ANNOTATION_ARGUMENTS) findAnnotation(annotationEntry)?.let { return it } if (this is FirProperty) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentMappingLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentsLazyResolver.kt similarity index 92% rename from analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentMappingLazyResolver.kt rename to analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentsLazyResolver.kt index 12b982a7b71..cecc0ea5e92 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentMappingLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentsLazyResolver.kt @@ -21,12 +21,12 @@ import org.jetbrains.kotlin.fir.references.isError import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirResolveContextCollector -import org.jetbrains.kotlin.fir.resolve.transformers.plugin.FirAnnotationArgumentsMappingTransformer +import org.jetbrains.kotlin.fir.resolve.transformers.plugin.FirAnnotationArgumentsTransformer import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid import org.jetbrains.kotlin.fir.visitors.transformSingle -internal object LLFirAnnotationArgumentMappingLazyResolver : LLFirLazyResolver(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) { +internal object LLFirAnnotationArgumentsLazyResolver : LLFirLazyResolver(FirResolvePhase.ANNOTATION_ARGUMENTS) { override fun resolve( target: LLFirResolveTarget, lockProvider: LLFirLockProvider, @@ -34,7 +34,7 @@ internal object LLFirAnnotationArgumentMappingLazyResolver : LLFirLazyResolver(F scopeSession: ScopeSession, towerDataContextCollector: FirResolveContextCollector?, ) { - val resolver = LLFirAnnotationArgumentsMappingTargetResolver(target, lockProvider, session, scopeSession, towerDataContextCollector) + val resolver = LLFirAnnotationArgumentsTargetResolver(target, lockProvider, session, scopeSession, towerDataContextCollector) resolver.resolveDesignation() } @@ -44,7 +44,7 @@ internal object LLFirAnnotationArgumentMappingLazyResolver : LLFirLazyResolver(F } } -private class LLFirAnnotationArgumentsMappingTargetResolver( +private class LLFirAnnotationArgumentsTargetResolver( resolveTarget: LLFirResolveTarget, lockProvider: LLFirLockProvider, session: FirSession, @@ -54,9 +54,9 @@ private class LLFirAnnotationArgumentsMappingTargetResolver( resolveTarget, lockProvider, scopeSession, - FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING, + FirResolvePhase.ANNOTATION_ARGUMENTS, ) { - override val transformer = FirAnnotationArgumentsMappingTransformer( + override val transformer = FirAnnotationArgumentsTransformer( session, scopeSession, resolverPhase, @@ -68,7 +68,7 @@ private class LLFirAnnotationArgumentsMappingTargetResolver( resolveWithKeeper( target, target.llFirSession, - AnnotationArgumentMappingStateKeepers.DECLARATION, + AnnotationArgumentsStateKeepers.DECLARATION, prepareTarget = FirLazyBodiesCalculator::calculateAnnotations, ) { transformAnnotations(target) @@ -113,7 +113,7 @@ internal val FirElementWithResolveState.isRegularDeclarationWithAnnotation: Bool else -> false } -internal object AnnotationArgumentMappingStateKeepers { +internal object AnnotationArgumentsStateKeepers { private val ANNOTATION: StateKeeper = stateKeeper { _, session -> add(ANNOTATION_BASE, session) add(FirAnnotation::argumentMapping, FirAnnotation::replaceArgumentMapping) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyPhaseResolverByPhase.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyPhaseResolverByPhase.kt index 3f3d837ae8e..7e7207ace83 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyPhaseResolverByPhase.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirLazyPhaseResolverByPhase.kt @@ -17,7 +17,7 @@ internal object LLFirLazyPhaseResolverByPhase { this[FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS] = LLFirCompilerAnnotationsLazyResolver this[FirResolvePhase.CONTRACTS] = LLFirContractsLazyResolver this[FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE] = LLFirImplicitTypesLazyResolver - this[FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING] = LLFirAnnotationArgumentMappingLazyResolver + this[FirResolvePhase.ANNOTATION_ARGUMENTS] = LLFirAnnotationArgumentsLazyResolver this[FirResolvePhase.BODY_RESOLVE] = LLFirBodyLazyResolver this[FirResolvePhase.EXPECT_ACTUAL_MATCHING] = LLFirExpectActualMatcherLazyResolver this[FirResolvePhase.SEALED_CLASS_INHERITORS] = LLFirSealedClassInheritorsLazyResolver 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 b98ef9a9e20..1b2bfdd9cc4 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationArgument.txt @@ -16,5 +16,5 @@ FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgument.kt 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| { + @R|Annotation|[Types](name = String(y)) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Unit| { } 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 30a1142c42c..7e3029d13af 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationArgumentList.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationArgumentList.txt @@ -16,5 +16,5 @@ FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentList.kt 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| { + @R|Annotation|[Types](name = String(y)) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Unit| { } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt index 8d76d117327..a452805fcc6 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt @@ -21,5 +21,5 @@ FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentScript.kts } - @R|Annotation|[Types](name = String(y)) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { + @R|Annotation|[Types](name = String(y)) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Unit| { } 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 94c748689df..991ae0d558c 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationCallExpression.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationCallExpression.txt @@ -7,5 +7,5 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationCallExpression.kt - @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { + @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Unit| { } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationCallExpressionScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationCallExpressionScript.txt index 8cacb04e328..5ff573083e0 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationCallExpressionScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationCallExpressionScript.txt @@ -11,5 +11,5 @@ FILE: [ResolvedTo(IMPORTS)] annotationApplicationCallExpressionScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { + @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Unit| { } 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 50da2b96a8e..0d833353f92 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationVarargArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationVarargArgument.txt @@ -7,5 +7,5 @@ String(2) FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationVarargArgument.kt - @R|kotlin/Suppress|[Types](names = vararg(String(1), String(2))) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { + @R|kotlin/Suppress|[Types](names = vararg(String(1), String(2))) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Unit| { } 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 fb83f430a1f..8e82eda15b9 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationWithArguments.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationApplicationWithArguments.txt @@ -7,5 +7,5 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationApplicationWithArguments.kt - @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { + @R|kotlin/Suppress|[Types](names = vararg(String())) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Unit| { } 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 449c3bbd76f..111d11fb6c8 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnConstructorProperty.txt @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationOnConstructorProperty.kt public final [ResolvedTo(STATUS)] class Abc : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=Abc] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/Abc.i] @[Types]() i: R|kotlin/Int|): R|Abc| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=Abc] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/Abc.i] @[Types]() i: R|kotlin/Int|): R|Abc| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnEnumClass.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnEnumClass.txt index e19bde4255a..da26675bbbf 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnEnumClass.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnEnumClass.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationOnEnumClass.kt - @[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] enum class MyClass : R|kotlin/Enum| { + @[Types]() public final [ResolvedTo(ANNOTATION_ARGUMENTS)] enum class MyClass : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/MyClass.i] i: Int = LAZY_EXPRESSION): R|MyClass| { LAZY_super|> } 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 6c298a3d352..2667d8d4ad0 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 @@ -7,6 +7,6 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationOnReturnType.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|kotlin/String|.collectOfType([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] i: R|kotlin/Int|): { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun R|kotlin/String|.collectOfType([ResolvedTo(ANNOTATION_ARGUMENTS)] i: R|kotlin/Int|): { ^collectOfType IntegerLiteral(4) } 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 100d07e6e19..c612d4e6333 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnReturnType.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnReturnType.txt @@ -7,6 +7,6 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] annotationOnReturnType.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|kotlin/String|.collectOfType([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] i: R|kotlin/Int|): { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun R|kotlin/String|.collectOfType([ResolvedTo(ANNOTATION_ARGUMENTS)] i: R|kotlin/Int|): { ^collectOfType IntegerLiteral(4) } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnReturnTypeScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnReturnTypeScript.txt index dedbe8bcfcd..ffeb34e244f 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnReturnTypeScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/annotationOnReturnTypeScript.txt @@ -11,6 +11,6 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnReturnTypeScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|kotlin/String|.collectOfType([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] i: R|kotlin/Int|): { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun R|kotlin/String|.collectOfType([ResolvedTo(ANNOTATION_ARGUMENTS)] i: R|kotlin/Int|): { ^collectOfType IntegerLiteral(4) } 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 80ccf6282e3..0a0acbc61f0 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 @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt public final [ResolvedTo(STATUS)] class MyClass : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/MyClass.addCommaWarning] @[Types]() addCommaWarning: R|kotlin/Boolean| = LAZY_EXPRESSION): R|MyClass| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/MyClass.addCommaWarning] @[Types]() addCommaWarning: R|kotlin/Boolean| = LAZY_EXPRESSION): R|MyClass| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt index 005d9c93a8a..9371a465064 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/jvmFieldAnnotationOnConstructorProperty.txt @@ -8,13 +8,13 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] jvmFieldAnnotationOnConstructorProperty.kt public final [ResolvedTo(STATUS)] class MyClass : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/MyClass.addCommaWarning] addCommaWarning: R|kotlin/Boolean| = LAZY_EXPRESSION): R|MyClass| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/MyClass.addCommaWarning] addCommaWarning: R|kotlin/Boolean| = LAZY_EXPRESSION): R|MyClass| { LAZY_super } - 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| + field:@R|kotlin/jvm/JvmField|[Types]() public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var addCommaWarning: R|kotlin/Boolean| = R|/addCommaWarning| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] get(): R|kotlin/Boolean| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=MyClass] set([ResolvedTo(ANNOTATION_ARGUMENTS)] 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/retentionValue.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/retentionValue.txt index 44ab55df0f3..f6c9609d75a 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/retentionValue.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/retentionValue.txt @@ -7,7 +7,7 @@ R|kotlin/annotation/AnnotationRetention.SOURCE| FIR FILE: FILE: [ResolvedTo(IMPORTS)] retentionValue.kt - @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| { + @R|kotlin/annotation/Retention|[Types](value = Q|kotlin/annotation/AnnotationRetention|.R|kotlin/annotation/AnnotationRetention.SOURCE|) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/retentionValueScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/retentionValueScript.txt index e897bb9f377..59f66b8b477 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/retentionValueScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/retentionValueScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] retentionValueScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @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| { + @R|kotlin/annotation/Retention|[Types](value = Q|kotlin/annotation/AnnotationRetention|.R|kotlin/annotation/AnnotationRetention.SOURCE|) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } 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 e78ac5ddd8a..ed9668c18c0 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotation.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotation.txt @@ -19,7 +19,7 @@ FILE: [ResolvedTo(IMPORTS)] superCallAnnotation.kt } } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class B : R|@R|Anno|() A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class B : R|@R|Anno|() A| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super<@R|Anno|[Types]() A> } 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 ce7e73b6195..f20bb20a35e 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotation2.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotation2.txt @@ -15,7 +15,7 @@ FILE: [ResolvedTo(IMPORTS)] superCallAnnotation2.kt } public? final? [ResolvedTo(SUPER_TYPES)] interface A : R|kotlin/Any| { } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class B : R|@R|Anno|() A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class B : R|@R|Anno|() A| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotationScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotationScript.txt index adfa21dfa0a..5af79cacf18 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotationScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/superCallAnnotationScript.txt @@ -25,7 +25,7 @@ FILE: [ResolvedTo(IMPORTS)] superCallAnnotationScript.kts } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class B : R|@R|Anno|() A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class B : R|@R|Anno|() A| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super<@R|Anno|[Types]() A> } 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 af48e93a5ab..ba63e2aa892 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameter.txt @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameter.kt public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt index 3e9ebe91251..b8f894e6bb1 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpression.txt @@ -8,7 +8,7 @@ String(abc) FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpression.kt public final [ResolvedTo(STATUS)] class ResolveMe : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt index e7f81bd6ac1..efa75541925 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt @@ -12,7 +12,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpressionScri [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| public final [ResolvedTo(STATUS)] class ResolveMe : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|(s = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt index afd03f62c52..2cc69713a03 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt @@ -12,7 +12,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterScript.kts [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt index d49b864e6ed..59617b1cee8 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorProperty.txt @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorProperty.kt public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt index 0c3d0b5c01c..d55f9042031 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyAndParameter.txt @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyAndParameter.kt public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION, [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] second: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION, [ResolvedTo(ANNOTATION_ARGUMENTS)] second: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt index 9a7524bac5f..c8eb6ea7d6d 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt @@ -12,7 +12,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyScript.kts [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|() kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt index e66ee41d9cb..cc8aad2a948 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArguments.txt @@ -8,7 +8,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyWithArguments.kt public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt index 3c853448d0b..4eb1c1c6e97 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt @@ -12,7 +12,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyWithArgumentsSc [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| public final [ResolvedTo(STATUS)] class ResolveMe : R|A| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=ResolveMe] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/ResolveMe.addCommaWarning] addCommaWarning: R|@R|Anno|(value = String(abc)) kotlin/Boolean| = LAZY_EXPRESSION): R|ResolveMe| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt index acf8515057f..585cc8f6e69 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameter.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: 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 final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun t([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| { } public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt index 3a67d35fe9e..af52ba77d78 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun t([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] addCommaWarning: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun t([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|() kotlin/Boolean|): R|kotlin/Unit| { } public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { 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 81ef51ab999..a0d91f23c89 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArguments.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArguments.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: 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 final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun t([ResolvedTo(ANNOTATION_ARGUMENTS)] 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)] [ContainingClassKey=A] constructor(): R|A| { diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt index 0fa7cee4327..c6224e251ae 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArgumentsScri SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - 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 final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun t([ResolvedTo(ANNOTATION_ARGUMENTS)] addCommaWarning: R|@R|Anno|(value = String(abcd)) kotlin/Boolean|): R|kotlin/Unit| { } public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { 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 edb9bd86f15..999295b3280 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunction.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunction.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverFunction.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|@R|Anno|(s = String(ab)) kotlin/Int|.check(): R|kotlin/Int| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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| { diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt index 55e4ed84a99..c8fe891aa9b 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverFunctionScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|@R|Anno|(s = String(ab)) kotlin/Int|.check(): R|kotlin/Int| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun R|@R|Anno|(s = String(ab)) kotlin/Int|.check(): R|kotlin/Int| { ^check Int(1) } 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 e4550d75a3d..381cb63b1bb 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameter.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameter.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverParameter.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun @RECEIVER:R|Anno|[Types](s = String(ab)) R|kotlin/Int|.check(): R|kotlin/Int| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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| { diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt index e435b6c116f..f58346c7790 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverParameterScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun @RECEIVER:R|Anno|[Types](s = String(ab)) R|kotlin/Int|.check(): R|kotlin/Int| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun @RECEIVER:R|Anno|[Types](s = String(ab)) R|kotlin/Int|.check(): R|kotlin/Int| { ^check Int(1) } 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 7c8d777ce59..d4e58503302 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverProperty.txt @@ -7,8 +7,8 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverProperty.kt - 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| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val R|@R|Anno|(s = String(a)) kotlin/Int|.i: R|kotlin/String| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] 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| { 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 e314ac41241..951783b8d3b 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCall.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCall.txt @@ -7,8 +7,8 @@ R|Anno| FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyCall.kt - 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| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val R|@R|Anno|(s = String(a)) kotlin/Int|.i: R|kotlin/String| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] 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| { diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt index ae695a44a19..1b8d65ab2d3 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt @@ -11,8 +11,8 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyCallScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - 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| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val R|@R|Anno|(s = String(a)) kotlin/Int|.i: R|kotlin/String| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/String| { ^ String() } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt index fdbc0b8ad0f..6ca523a586f 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt @@ -11,8 +11,8 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - 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| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val R|@R|Anno|(s = String(a)) kotlin/Int|.i: R|kotlin/String| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/String| { ^ String() } 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 6c2ce166308..7249d8d89cc 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunction.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunction.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnFunction.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun check(): R|@R|Anno|(s = String(ab)) kotlin/Int| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] 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| { diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt index d8c7aae7c98..d0f0d324f0c 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnFunctionScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun check(): R|@R|Anno|(s = String(ab)) kotlin/Int| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun check(): R|@R|Anno|(s = String(ab)) kotlin/Int| { ^check IntegerLiteral(1) } 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 c2120d8e606..2c93989fc84 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnProperty.txt @@ -7,8 +7,8 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnProperty.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val i: R|@R|Anno|(s = String(ab)) kotlin/Int| = IntegerLiteral(1) - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|@R|Anno|(s = String(ab)) kotlin/Int| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val i: R|@R|Anno|(s = String(ab)) kotlin/Int| = IntegerLiteral(1) + public [ResolvedTo(ANNOTATION_ARGUMENTS)] 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)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { LAZY_super diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt index 2651bda6778..d7e8172ddab 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt @@ -11,8 +11,8 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnPropertyScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val i: R|@R|Anno|(s = String(ab)) kotlin/Int| = IntegerLiteral(1) - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|@R|Anno|(s = String(ab)) kotlin/Int| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val i: R|@R|Anno|(s = String(ab)) kotlin/Int| = IntegerLiteral(1) + public [ResolvedTo(ANNOTATION_ARGUMENTS)] 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)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { 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 826b53221af..8ac406ff047 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 @@ -18,11 +18,11 @@ FILE: [ResolvedTo(IMPORTS)] delegate.kt LAZY_super } - field:@PROPERTY_DELEGATE_FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val a: by #( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { + field:@PROPERTY_DELEGATE_FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val a: by #( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { ^ Int(1) } ) - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] get(): { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): { ^ this@R|/X|.D|/X.a|.#(this@R|/X|, ::R|/X.a|) } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/delegateScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/delegateScript.txt index c33ff0f81fb..e3087db1966 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/delegateScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/delegateScript.txt @@ -23,11 +23,11 @@ FILE: [ResolvedTo(IMPORTS)] delegateScript.kts LAZY_super } - field:@PROPERTY_DELEGATE_FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val a: by #( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { + field:@PROPERTY_DELEGATE_FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val a: by #( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { ^ Int(1) } ) - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] get(): { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): { ^ this@R|/X|.D|/X.a|.#(this@R|/X|, ::R|/X.a|) } 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 0fefc498828..8320612455b 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 @@ -14,12 +14,12 @@ FILE: [ResolvedTo(IMPORTS)] field.kt } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - 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| + field:@FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] 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/fieldScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/fieldScript.txt index 839542e208d..f0b80a7751f 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/fieldScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/fieldScript.txt @@ -19,12 +19,12 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - 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| + field:@FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] 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 11718952f60..699c6d459ef 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 @@ -14,12 +14,12 @@ FILE: [ResolvedTo(IMPORTS)] getter.kt } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - 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| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + @PROPERTY_GETTER:R|Ann|[Types]() public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] 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/getterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getterScript.txt index 07b1479e82e..1f95d5721f1 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/getterScript.txt @@ -19,12 +19,12 @@ FILE: [ResolvedTo(IMPORTS)] getterScript.kts } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - 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| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + @PROPERTY_GETTER:R|Ann|[Types]() public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] 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 c9144bc9035..1fe00b9ca26 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 @@ -14,7 +14,7 @@ FILE: [ResolvedTo(IMPORTS)] param.kt } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - 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| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] @CONSTRUCTOR_PARAMETER:R|Ann|[Types]() x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/paramScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/paramScript.txt index 9c124672f2a..05578553d4d 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/paramScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/paramScript.txt @@ -19,7 +19,7 @@ FILE: [ResolvedTo(IMPORTS)] paramScript.kts } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - 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| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] @CONSTRUCTOR_PARAMETER:R|Ann|[Types]() x: R|kotlin/Int|): R|X| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/property.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/property.txt index d2c71d1f51a..cec31f016d5 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 @@ -14,12 +14,12 @@ FILE: [ResolvedTo(IMPORTS)] property.kt } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - @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| + @PROPERTY:R|Ann|[Types]() public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] 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/propertyScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/propertyScript.txt index ecbf039e3c1..459ee41819b 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/propertyScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/propertyScript.txt @@ -19,12 +19,12 @@ FILE: [ResolvedTo(IMPORTS)] propertyScript.kts } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - @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| + @PROPERTY:R|Ann|[Types]() public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] 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 1d7eb0fb700..76ea4e93d73 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 @@ -14,12 +14,12 @@ FILE: [ResolvedTo(IMPORTS)] setParam.kt } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - 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| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] @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/setParamScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParamScript.txt index bce7a77b66a..f964000cf8e 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParamScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setParamScript.txt @@ -19,12 +19,12 @@ FILE: [ResolvedTo(IMPORTS)] setParamScript.kts } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - 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| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] @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 7c5e68f8d3d..fa960227685 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 @@ -14,12 +14,12 @@ FILE: [ResolvedTo(IMPORTS)] setter.kt } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - 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| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + @PROPERTY_SETTER:R|Ann|[Types]() public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] 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/setterScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setterScript.txt index e90e8a25244..1d382f4d52e 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setterScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/setterScript.txt @@ -19,12 +19,12 @@ FILE: [ResolvedTo(IMPORTS)] setterScript.kts } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] constructor([ResolvedTo(ANNOTATION_ARGUMENTS)] [CorrespondingProperty=/X.x] x: R|kotlin/Int|): R|X| { LAZY_super } - 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| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [IsFromPrimaryConstructor=true] var x: R|kotlin/Int| = R|/x| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] get(): R|kotlin/Int| + @PROPERTY_SETTER:R|Ann|[Types]() public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=X] set([ResolvedTo(ANNOTATION_ARGUMENTS)] value: R|kotlin/Int|): R|kotlin/Unit| } \ No newline at end of file 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 d720d4e7583..4337bd62428 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/superType.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/superType.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] superType.kt public? final? [ResolvedTo(SUPER_TYPES)] interface A : R|kotlin/Any| { } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class C : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class C : R|A| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/superTypeScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/superTypeScript.txt index 52bab2765c4..e7d8537ee87 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/calls/superTypeScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/calls/superTypeScript.txt @@ -14,7 +14,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeScript.kts public? final? [ResolvedTo(SUPER_TYPES)] interface A : R|kotlin/Any| { } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class C : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class C : R|A| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=C] constructor(): R|C| { LAZY_super<> } 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 2b3eae208ad..53f40feee4a 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/incompletePropertyWithAnnotation.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/incompletePropertyWithAnnotation.txt @@ -7,6 +7,6 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] incompletePropertyWithAnnotation.kt - @[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| + @[Types]() private final [ResolvedTo(ANNOTATION_ARGUMENTS)] var : + private [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): + private [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(ANNOTATION_ARGUMENTS)] value: ): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/missedTypeArgumentsInAnnotationCall.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/missedTypeArgumentsInAnnotationCall.txt index 088a1531099..09a61ddffb8 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/missedTypeArgumentsInAnnotationCall.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/invalidCode/missedTypeArgumentsInAnnotationCall.txt @@ -15,7 +15,7 @@ FILE: [ResolvedTo(IMPORTS)] missedTypeArgumentsInAnnotationCall.kt } } - @[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class A : R|kotlin/Any| { + @[Types]() public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|usage/A| { LAZY_super } 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 59f4aa8f3ea..abbe78ea2f4 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/functionalType.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/functionalType.txt @@ -7,7 +7,7 @@ R|(kotlin/Int) -> kotlin/String| FIR FILE: FILE: [ResolvedTo(IMPORTS)] functionalType.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|(kotlin/Int) -> kotlin/String| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|(kotlin/Int) -> kotlin/String| { ^x [ResolvedTo(RAW_FIR)] fun .(): { String() } 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 4ea73d19b43..2873446c787 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/functionalTypeArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/functionalTypeArgument.txt @@ -7,7 +7,7 @@ R|kotlin/Int| FIR FILE: FILE: [ResolvedTo(IMPORTS)] functionalTypeArgument.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|(kotlin/Int) -> kotlin/String| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|(kotlin/Int) -> kotlin/String| { ^x [ResolvedTo(RAW_FIR)] fun .(): { ^ Unit } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/functionalTypeScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/functionalTypeScript.txt index 534209143dd..d14bf31960b 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/functionalTypeScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/functionalTypeScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] functionalTypeScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|(kotlin/Int) -> kotlin/String| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|(kotlin/Int) -> kotlin/String| { ^x [ResolvedTo(RAW_FIR)] fun .(): { String() } 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 8d7b8a44a60..7881c1e3ebb 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/invalidTypeArgumentsCount.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/invalidTypeArgumentsCount.txt @@ -7,6 +7,6 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCount.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): { ^x IntegerLiteral(1) } 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 6281a7d4507..82c3f4523ba 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/invalidTypeArgumentsCountArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/invalidTypeArgumentsCountArgument.txt @@ -7,6 +7,6 @@ R|kotlin/String| FIR FILE: FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCountArgument.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): { ^x IntegerLiteral(1) } 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 d6097a110f7..4328ee2bd79 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/invalidTypeArgumentsCountFirstArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/invalidTypeArgumentsCountFirstArgument.txt @@ -7,6 +7,6 @@ R|kotlin/String| FIR FILE: FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCountFirstArgument.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): { ^x IntegerLiteral(1) } 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 72af6b0dfaa..a681a85a5ff 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/invalidTypeArgumentsCountLastArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/invalidTypeArgumentsCountLastArgument.txt @@ -7,6 +7,6 @@ R|kotlin/String| FIR FILE: FILE: [ResolvedTo(IMPORTS)] invalidTypeArgumentsCountLastArgument.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): { ^x IntegerLiteral(1) } 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 354b5a5f72b..1df60d033bf 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/nestedClassType.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/nestedClassType.txt @@ -25,7 +25,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassType.kt LAZY_super } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun create(): R|Foo.Nested| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun create(): R|Foo.Nested| { } } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/nestedClassTypeScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/nestedClassTypeScript.txt index 31b4e7519df..2c08202d5dc 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/nestedClassTypeScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/nestedClassTypeScript.txt @@ -30,7 +30,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassTypeScript.kts LAZY_super } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun create(): R|Foo.Nested| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun create(): R|Foo.Nested| { } } 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 4a9b40ba4a8..e74e7214c78 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/nestedTypeArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/nestedTypeArgument.txt @@ -7,6 +7,6 @@ R|kotlin/Int| FIR FILE: FILE: [ResolvedTo(IMPORTS)] nestedTypeArgument.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/collections/Map>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/collections/Map>| { ^x IntegerLiteral(1) } 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 d36e2e2f649..d19119967ba 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/nullableType.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/nullableType.txt @@ -7,6 +7,6 @@ R|kotlin/Int?| FIR FILE: FILE: [ResolvedTo(IMPORTS)] nullableType.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Int?| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Int?| { ^x IntegerLiteral(1) } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/nullableTypeScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/nullableTypeScript.txt index 805062a3e1b..9757a30edbb 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/nullableTypeScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/nullableTypeScript.txt @@ -11,6 +11,6 @@ FILE: [ResolvedTo(IMPORTS)] nullableTypeScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Int?| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Int?| { ^x IntegerLiteral(1) } 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 3f5c71c955c..f090a18efde 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/nullableTypeWithooutQuestionMark.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/nullableTypeWithooutQuestionMark.txt @@ -7,6 +7,6 @@ R|kotlin/Int?| FIR FILE: FILE: [ResolvedTo(IMPORTS)] nullableTypeWithooutQuestionMark.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Int?| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Int?| { ^x IntegerLiteral(1) } 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 3e0c020ccfe..d15176cb274 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/receiverType.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/receiverType.txt @@ -7,7 +7,7 @@ R|T| FIR FILE: 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| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun <@R|A|[Types]() [ResolvedTo(ANNOTATION_ARGUMENTS)] 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)] [ContainingClassKey=A] constructor(): R|A| { diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/receiverTypeScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/receiverTypeScript.txt index 70a939e78e5..cf4d22d8d2e 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/receiverTypeScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/receiverTypeScript.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(IMPORTS)] receiverTypeScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun <@R|A|[Types]() [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] T> R|T|.test(): R|kotlin/Unit| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun <@R|A|[Types]() [ResolvedTo(ANNOTATION_ARGUMENTS)] 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| { diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType.txt index abae9ddfd4a..68f86d70c75 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] superType.kt } } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class B : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class B : R|A| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType2.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType2.txt index ddbfd676016..ee07d81e85f 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType2.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType2.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] superType2.kt public? final? [ResolvedTo(SUPER_TYPES)] interface A : R|kotlin/Any| { } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class B : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class B : R|A| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType3.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType3.txt index 7d170467d71..05f74cb8e74 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType3.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superType3.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] superType3.kt public? final? [ResolvedTo(SUPER_TYPES)] interface A : R|kotlin/Any| { } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [DelegateFieldsMapKey={0=FirFieldSymbol /B.$$delegate_0}] class B : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol /B.$$delegate_0}] class B : R|A| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeAndGeneratedProperty.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeAndGeneratedProperty.txt index 396abe28a80..0337b8be907 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeAndGeneratedProperty.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeAndGeneratedProperty.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeAndGeneratedProperty.kt } } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] class B : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class B : R|A| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/B.prop] prop: String = LAZY_EXPRESSION): R|B| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject.txt index 58b2fd7fc78..668aba65161 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeInObject.kt } } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] object B : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] object B : R|A| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject2.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject2.txt index 0d879c7f9b9..3a9e2e8a89e 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject2.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject2.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] superTypeInObject2.kt public? final? [ResolvedTo(SUPER_TYPES)] interface A : R|kotlin/Any| { } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] object B : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] object B : R|A| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject3.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject3.txt index 988a949d1ed..8e07bafce19 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject3.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeInObject3.txt @@ -9,7 +9,7 @@ FIR FILE: FILE: [ResolvedTo(IMPORTS)] superTypeInObject3.kt public? final? [ResolvedTo(SUPER_TYPES)] interface A : R|kotlin/Any| { } - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [DelegateFieldsMapKey={0=FirFieldSymbol /B.$$delegate_0}] object B : R|A| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol /B.$$delegate_0}] object B : R|A| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeOnEnumClass.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeOnEnumClass.txt index 233fc137d4d..7a7119fa17f 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeOnEnumClass.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/superTypeOnEnumClass.txt @@ -7,7 +7,7 @@ FIR element rendered: FIR FILE: FILE: [ResolvedTo(IMPORTS)] superTypeOnEnumClass.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] enum class MyClass : , R|kotlin/Enum| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] enum class MyClass : , R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/MyClass.i] i: Int = LAZY_EXPRESSION): R|MyClass| { LAZY_super|> } 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 5da7a46b1b1..981337e6889 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/typeArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/typeArgument.txt @@ -7,6 +7,6 @@ R|kotlin/collections/List| FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeArgument.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/collections/Map>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/collections/Map>| { ^x IntegerLiteral(1) } 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 df45be172dd..d2452ac69bd 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/typeParameterBound.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/typeParameterBound.txt @@ -7,5 +7,5 @@ R|kotlin/Number| FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeParameterBound.kt - 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| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun <[ResolvedTo(ANNOTATION_ARGUMENTS)] T : R|kotlin/Number|> check([ResolvedTo(ANNOTATION_ARGUMENTS)] t: R|T|): R|kotlin/Unit| { } 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 7b057a164f6..ecf71c9f875 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/typeParameterBoundNested.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/typeParameterBoundNested.txt @@ -7,5 +7,5 @@ R|kotlin/Int| FIR FILE: FILE: [ResolvedTo(IMPORTS)] typeParameterBoundNested.kt - 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| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun <[ResolvedTo(ANNOTATION_ARGUMENTS)] T : R|kotlin/collections/List>|> check([ResolvedTo(ANNOTATION_ARGUMENTS)] t: R|T|): R|kotlin/Unit| { } 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 6fafcccbee3..94100d46e95 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/unresolvedTypeArgumentResolvedTypeConsturctor.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/unresolvedTypeArgumentResolvedTypeConsturctor.txt @@ -7,6 +7,6 @@ R|kotlin/collections/List| FIR FILE: FILE: [ResolvedTo(IMPORTS)] unresolvedTypeArgumentResolvedTypeConsturctor.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/collections/List| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/collections/List| { ^x IntegerLiteral(1) } 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 99e4a7fb9ee..5e76571b8e4 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/unresolvedTypeConsturctorResolvedNestedTypeArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/unresolvedTypeConsturctorResolvedNestedTypeArgument.txt @@ -7,6 +7,6 @@ R|kotlin/Int| FIR FILE: FILE: [ResolvedTo(IMPORTS)] unresolvedTypeConsturctorResolvedNestedTypeArgument.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): { ^x IntegerLiteral(1) } 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 74dbdced5c3..8ffba5354be 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/unresolvedTypeConsturctorResolvedTypeArgument.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/unresolvedTypeConsturctorResolvedTypeArgument.txt @@ -7,6 +7,6 @@ R|kotlin/collections/List| FIR FILE: FILE: [ResolvedTo(IMPORTS)] unresolvedTypeConsturctorResolvedTypeArgument.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): { ^x IntegerLiteral(1) } 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 d3f0d010964..eb635e18454 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/wholeType.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/wholeType.txt @@ -7,6 +7,6 @@ R|kotlin/collections/Map>| FIR FILE: FILE: [ResolvedTo(IMPORTS)] wholeType.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/collections/Map>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/collections/Map>| { ^x IntegerLiteral(1) } diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/types/wholeTypeScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/types/wholeTypeScript.txt index ec7bf390a31..9ed8fe04c65 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/types/wholeTypeScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/types/wholeTypeScript.txt @@ -11,6 +11,6 @@ FILE: [ResolvedTo(IMPORTS)] wholeTypeScript.kts SCRIPT: [ResolvedTo(TYPES)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/collections/Map>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/collections/Map>| { ^x IntegerLiteral(1) } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/entireFunctionBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/entireFunctionBody.txt index 13fd252d3c2..476fbc70928 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/entireFunctionBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/entireFunctionBody.txt @@ -3,4 +3,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun doo(): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun doo(): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/entireFunctionBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/entireFunctionBodyScript.txt index 13fd252d3c2..476fbc70928 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/entireFunctionBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/entireFunctionBodyScript.txt @@ -3,4 +3,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun doo(): R|kotlin/Unit| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun doo(): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun doo(): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/entireGetterBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/entireGetterBody.txt index 23da416dddf..6c84f53ce95 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/entireGetterBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/entireGetterBody.txt @@ -4,5 +4,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val i: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val i: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val i: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/entireGetterBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/entireGetterBodyScript.txt index 23da416dddf..6c84f53ce95 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/entireGetterBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/entireGetterBodyScript.txt @@ -4,5 +4,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val i: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val i: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val i: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/entireSetterBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/entireSetterBody.txt index d608f4cf463..03d3bbabb5d 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/entireSetterBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/entireSetterBody.txt @@ -5,6 +5,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var i: R|kotlin/Int| = Int(4) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var i: R|kotlin/Int| = Int(4) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var i: R|kotlin/Int| = Int(4) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/entireSetterBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/entireSetterBodyScript.txt index d608f4cf463..03d3bbabb5d 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/entireSetterBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/entireSetterBodyScript.txt @@ -5,6 +5,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var i: R|kotlin/Int| = Int(4) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var i: R|kotlin/Int| = Int(4) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var i: R|kotlin/Int| = Int(4) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/extensionWithDefaultParameters.txt b/analysis/low-level-api-fir/testData/inBlockModification/extensionWithDefaultParameters.txt index bd58d4ec62a..1086f5f8a70 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/extensionWithDefaultParameters.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/extensionWithDefaultParameters.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun R|MyProducer|.testFun([ResolvedTo(BO } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|MyProducer|.testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int| = this@R|/testFun|.R|/MyProducer.produce|()): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun R|MyProducer|.testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int| = this@R|/testFun|.R|/MyProducer.produce|()): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/extensionWithDefaultParametersScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/extensionWithDefaultParametersScript.txt index bd58d4ec62a..1086f5f8a70 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/extensionWithDefaultParametersScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/extensionWithDefaultParametersScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun R|MyProducer|.testFun([ResolvedTo(BO } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun R|MyProducer|.testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int| = this@R|/testFun|.R|/MyProducer.produce|()): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun R|MyProducer|.testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int| = this@R|/testFun|.R|/MyProducer.produce|()): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/functionWithDefaultParameters.txt b/analysis/low-level-api-fir/testData/inBlockModification/functionWithDefaultParameters.txt index a0ebc3bab6d..f50e60195b7 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/functionWithDefaultParameters.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/functionWithDefaultParameters.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun testFun([ResolvedTo(BODY_RESOLVE)] p } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] param2: R|kotlin/String| = String(str), [ResolvedTo(BODY_RESOLVE)] param3: R|kotlin/collections/List| = R|/myList|()): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] param2: R|kotlin/String| = String(str), [ResolvedTo(BODY_RESOLVE)] param3: R|kotlin/collections/List| = R|/myList|()): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/functionWithDefaultParametersScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/functionWithDefaultParametersScript.txt index a0ebc3bab6d..f50e60195b7 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/functionWithDefaultParametersScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/functionWithDefaultParametersScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun testFun([ResolvedTo(BODY_RESOLVE)] p } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] param2: R|kotlin/String| = String(str), [ResolvedTo(BODY_RESOLVE)] param3: R|kotlin/collections/List| = R|/myList|()): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] param2: R|kotlin/String| = String(str), [ResolvedTo(BODY_RESOLVE)] param3: R|kotlin/collections/List| = R|/myList|()): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithType.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithType.txt index d48eb3b1e2f..17c02016277 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithType.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithType.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Int| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithTypeScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithTypeScript.txt index d48eb3b1e2f..17c02016277 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithTypeScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithTypeScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Int| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutType.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutType.txt index 9bd5bd27722..5d356db1abc 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutType.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutType.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeScript.txt index 9bd5bd27722..5d356db1abc 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeWithoutName.txt index c8a4230648b..484f3afef94 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeWithoutName.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Unit| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun (): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun (): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeWithoutNameScript.txt index c8a4230648b..484f3afef94 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithBodyWithoutTypeWithoutNameScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Unit| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun (): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun (): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithTypeWithoutBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithTypeWithoutBody.txt index d48eb3b1e2f..17c02016277 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithTypeWithoutBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithTypeWithoutBody.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Int| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithTypeWithoutBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithTypeWithoutBodyScript.txt index d48eb3b1e2f..17c02016277 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithTypeWithoutBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithTypeWithoutBodyScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Int| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun x(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun x(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithoutBodyWithTypeWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithoutBodyWithTypeWithoutName.txt index c6237db38ab..7574013953e 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithoutBodyWithTypeWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithoutBodyWithTypeWithoutName.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun (): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun (): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithoutBodyWithTypeWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithoutBodyWithTypeWithoutNameScript.txt index c6237db38ab..7574013953e 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithoutBodyWithTypeWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberFunWithoutBodyWithTypeWithoutNameScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun (): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun (): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithBody.txt index ca1190e46df..d403086bba0 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithBody.txt @@ -9,5 +9,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithBodyScript.txt index ca1190e46df..d403086bba0 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithBodyScript.txt @@ -9,5 +9,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBody.txt index ead91544187..07cb1460f71 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBody.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyScript.txt index ead91544187..07cb1460f71 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyScript.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyWithoutName.txt index 64df841f4b8..479cf4b84cb 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyWithoutName.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val : R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val : R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val : R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyWithoutNameScript.txt index 64df841f4b8..479cf4b84cb 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithTypeWithoutBodyWithoutNameScript.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val : R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val : R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val : R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithoutTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithoutTypeWithBody.txt index ead91544187..07cb1460f71 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithoutTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithoutTypeWithBody.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithoutTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithoutTypeWithBodyScript.txt index ead91544187..07cb1460f71 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithoutTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberGetterWithoutTypeWithBodyScript.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBody.txt index 944ec5016a6..49e3f8b5800 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBody.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(1) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyScript.txt index 944ec5016a6..49e3f8b5800 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyScript.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(1) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyWithoutName.txt index 4c323b74e7a..4eeff375489 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyWithoutName.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Int| = } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var : R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var : R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyWithoutNameScript.txt index 4c323b74e7a..4eeff375489 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithBodyWithoutNameScript.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Int| = } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var : R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var : R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBody.txt index 9c7db20e16f..c4dc00ae482 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBody.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(1) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyScript.txt index 9c7db20e16f..c4dc00ae482 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyScript.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(1) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyWithoutName.txt index ba617b72667..49939032f59 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyWithoutName.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Int| = } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var : R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var : R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyWithoutNameScript.txt index ba617b72667..49939032f59 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithTypeWithoutBodyWithoutNameScript.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Int| = } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var : R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var : R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithBody.txt index 1f0b2ac8170..5a34e6ea482 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithBody.txt @@ -8,8 +8,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| { ^ Int(1) } - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithBodyScript.txt index 1f0b2ac8170..5a34e6ea482 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithBodyScript.txt @@ -8,8 +8,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| { ^ Int(1) } - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithoutBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithoutBody.txt index 970b51eef53..e39b20a6275 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithoutBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithoutBody.txt @@ -8,8 +8,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| { ^ Int(1) } - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithoutBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithoutBodyScript.txt index 970b51eef53..e39b20a6275 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithoutBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/memberSetterWithoutTypeWithoutBodyScript.txt @@ -8,8 +8,8 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=A] get(): R|kotlin/Int| { ^ Int(1) } - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] [ContainingClassKey=A] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/rawContract.txt b/analysis/low-level-api-fir/testData/inBlockModification/rawContract.txt index 84fe9f44498..b38221ff907 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/rawContract.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/rawContract.txt @@ -12,4 +12,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] arg: } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo([ResolvedTo(BODY_RESOLVE)] arg: R|kotlin/Any?|, [ResolvedTo(BODY_RESOLVE)] num: R|kotlin/Int?|, [ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo([ResolvedTo(BODY_RESOLVE)] arg: R|kotlin/Any?|, [ResolvedTo(BODY_RESOLVE)] num: R|kotlin/Int?|, [ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/rawContractScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/rawContractScript.txt index 84fe9f44498..b38221ff907 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/rawContractScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/rawContractScript.txt @@ -12,4 +12,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] arg: } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo([ResolvedTo(BODY_RESOLVE)] arg: R|kotlin/Any?|, [ResolvedTo(BODY_RESOLVE)] num: R|kotlin/Int?|, [ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo([ResolvedTo(BODY_RESOLVE)] arg: R|kotlin/Any?|, [ResolvedTo(BODY_RESOLVE)] num: R|kotlin/Int?|, [ResolvedTo(BODY_RESOLVE)] block: R|() -> kotlin/Unit|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutName.txt index c8a4230648b..484f3afef94 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutName.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Unit| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun (): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun (): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutNameScript.txt index c8a4230648b..484f3afef94 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutNameScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Unit| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun (): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun (): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBody.txt index 029a1a9d4b6..a32fdafa339 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBody.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.txt index 8fd2fcfdf48..ff9607b2884 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBodyDumpFile.txt @@ -9,7 +9,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] topLevelFunctionWithTypeWithBodyDumpFile.kt AFTER MODIFICATION: FILE: [ResolvedTo(BODY_RESOLVE)] topLevelFunctionWithTypeWithBodyDumpFile.kt - public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } public final [ResolvedTo(BODY_RESOLVE)] fun doSmth([ResolvedTo(BODY_RESOLVE)] i: R|kotlin/String|): R|kotlin/Int| { ^doSmth Int(4) } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBodyScript.txt index 029a1a9d4b6..a32fdafa339 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithBodyScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithoutBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithoutBody.txt index 029a1a9d4b6..a32fdafa339 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithoutBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithoutBody.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithoutBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithoutBodyScript.txt index 029a1a9d4b6..a32fdafa339 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithoutBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithTypeWithoutBodyScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Int| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutName.txt index c6237db38ab..7574013953e 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutName.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun (): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun (): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutNameScript.txt index c6237db38ab..7574013953e 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutNameScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun (): R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun (): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun (): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutTypeWithBody.txt index e69f3450898..1e16e3116f3 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutTypeWithBody.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutTypeWithBodyScript.txt index e69f3450898..1e16e3116f3 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelFunctionWithoutTypeWithBodyScript.txt @@ -4,4 +4,4 @@ public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBody.txt index 030d1c5ab19..05ae83b1912 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBody.txt @@ -9,5 +9,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyScript.txt index 030d1c5ab19..05ae83b1912 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyScript.txt @@ -9,5 +9,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyWithoutName.txt index b6971319492..41c6fbc1c70 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyWithoutName.txt @@ -9,5 +9,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val : R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val : R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val : R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyWithoutNameScript.txt index b6971319492..41c6fbc1c70 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithBodyWithoutNameScript.txt @@ -9,5 +9,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val : R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val : R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val : R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBody.txt index f922d740393..c5b3edd10f8 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBody.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyScript.txt index f922d740393..c5b3edd10f8 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyScript.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutName.txt index f44024e638d..acc594de661 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutName.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val : R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val : R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val : R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutNameScript.txt index f44024e638d..acc594de661 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutNameScript.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val : R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val : R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val : R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithoutTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithoutTypeWithBody.txt index f922d740393..c5b3edd10f8 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithoutTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithoutTypeWithBody.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithoutTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithoutTypeWithBodyScript.txt index f922d740393..c5b3edd10f8 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithoutTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelGetterWithoutTypeWithBodyScript.txt @@ -5,5 +5,5 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] get(): R|kotlin/Int| { LAZY_BLOCK } +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| + public [ResolvedTo(ANNOTATION_ARGUMENTS)] get(): R|kotlin/Int| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBody.txt index e0122d6b81e..f5eb4c2e8a4 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBody.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(1) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyScript.txt index e0122d6b81e..f5eb4c2e8a4 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyScript.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(1) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyWithoutName.txt index 9c40311eda1..3a55dc4e45c 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyWithoutName.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Int| = } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var : R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var : R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyWithoutNameScript.txt index 9c40311eda1..3a55dc4e45c 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithBodyWithoutNameScript.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Int| = } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var : R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var : R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBody.txt index ede6f8be951..dcbf786d584 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBody.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(1) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyScript.txt index ede6f8be951..dcbf786d584 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyScript.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var x: R|kotlin/Int| = Int(1) } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var x: R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var x: R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutName.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutName.txt index b00f0f26472..9bb2baffec5 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutName.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutName.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Int| = } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var : R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var : R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutNameScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutNameScript.txt index b00f0f26472..9bb2baffec5 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutNameScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutNameScript.txt @@ -6,6 +6,6 @@ public final [ResolvedTo(BODY_RESOLVE)] var : R|kotlin/Int| = } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] var : R|kotlin/Int| = Int(1) +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] var : R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| - public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } + public [ResolvedTo(ANNOTATION_ARGUMENTS)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithBody.txt index 5bba1f8b9a0..1c765e78390 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithBody.txt @@ -5,7 +5,7 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { ^ Int(1) } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithBodyScript.txt index 5bba1f8b9a0..1c765e78390 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithBodyScript.txt @@ -5,7 +5,7 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { ^ Int(1) } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithoutBody.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithoutBody.txt index 5bba1f8b9a0..1c765e78390 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithoutBody.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithoutBody.txt @@ -5,7 +5,7 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { ^ Int(1) } diff --git a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithoutBodyScript.txt b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithoutBodyScript.txt index 5bba1f8b9a0..1c765e78390 100644 --- a/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithoutBodyScript.txt +++ b/analysis/low-level-api-fir/testData/inBlockModification/topLevelSetterWithoutTypeWithoutBodyScript.txt @@ -5,7 +5,7 @@ public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/Int| } AFTER MODIFICATION: -public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val x: R|kotlin/Int| +public final [ResolvedTo(ANNOTATION_ARGUMENTS)] val x: R|kotlin/Int| public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { ^ Int(1) } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt index 0852aef41cc..c4ce295f1a7 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt @@ -450,7 +450,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } -ANNOTATIONS_ARGUMENTS_MAPPING: +ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { @@ -493,7 +493,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|EnumClass| } - @R|kotlin/Deprecated|[Types](message = #()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = (Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun foo(): R|kotlin/Unit| { + @R|kotlin/Deprecated|[Types](message = #()) @R|Anno|[Types](str = String(123), ann = R|/AnotherAnnotation.AnotherAnnotation|(), c = (Q|AnotherAnnotation|), entry = Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(ANNOTATION_ARGUMENTS)] fun foo(): R|kotlin/Unit| { } BODY_RESOLVE: diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt index 1270f314688..a5ea1b0a051 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt @@ -530,7 +530,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } -ANNOTATIONS_ARGUMENTS_MAPPING: +ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts context(