From 7f778eafa5d8dc236eb6ce9121e282dd8a7634f6 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 10 May 2023 14:35:47 +0200 Subject: [PATCH] [LL FIR] add missing declarations transformations for COMPILER_REQUIRED_ANNOTATIONS phase The transformed does nothing previously ^KT-56550 --- .../transformers/LLFirCompilerAnnotationsLazyResolver.kt | 7 ++----- .../nestedCompilerRequiredAnnotationsForMember.txt | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt index bfc64db7743..3550b828801 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirCompilerAnnotationsLazyResolver.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.plugin.CompilerRequiredAnno import org.jetbrains.kotlin.fir.resolve.transformers.plugin.FirCompilerRequiredAnnotationsResolveTransformer import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase +import org.jetbrains.kotlin.fir.visitors.transformSingle internal object LLFirCompilerAnnotationsLazyResolver : LLFirLazyResolver(FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) { override fun resolve( @@ -96,10 +97,6 @@ private class LLFirCompilerRequiredAnnotationsTargetResolver( FirLazyBodiesCalculator.calculateCompilerAnnotations(target) when { - target is FirTypeAlias -> { - transformer.transformTypeAlias(target, null) - } - target is FirRegularClass -> { transformer.annotationTransformer.resolveRegularClass( target, @@ -113,7 +110,7 @@ private class LLFirCompilerRequiredAnnotationsTargetResolver( } target.isRegularDeclarationWithAnnotation -> { - + target.transformSingle(transformer.annotationTransformer, null) } else -> throwUnexpectedFirElementError(target) diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt index bfb1f916551..a8f99e0b87d 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/nestedCompilerRequiredAnnotationsForMember.txt @@ -155,7 +155,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|/a| public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): Int - @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK } + @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(memberFunction)) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK } @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): @@ -217,7 +217,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|/a| public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): Int - @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK } + @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(memberFunction)) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK } @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): @@ -279,7 +279,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedCompilerRequiredAnnotationsForMember.kt @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val a: Int = R|/a| public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get(): Int - @Deprecated[Unresolved](String(memberFunction)) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK } + @R|kotlin/Deprecated|[CompilerRequiredAnnotations](String(memberFunction)) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun memberFunction(): R|kotlin/Unit| { LAZY_BLOCK } @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] val memberProperty: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedClass] get():