From 7891b025a58349943f6435f4450b9aa3dd0ccab4 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 20 Mar 2023 15:02:08 +0100 Subject: [PATCH] [LL FIR] FirLazyAnnotationTransformer: add missing compiler annotation ^KT-57424 --- .../fir/lazy/resolve/FirLazyBodiesCalculator.kt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt index 66e2fc9e744..66e7fa68a2d 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt @@ -18,16 +18,13 @@ import org.jetbrains.kotlin.fir.expressions.impl.FirLazyBlock import org.jetbrains.kotlin.fir.expressions.impl.FirLazyDelegatedConstructorCall import org.jetbrains.kotlin.fir.expressions.impl.FirLazyExpression import org.jetbrains.kotlin.fir.extensions.registeredPluginAnnotations +import org.jetbrains.kotlin.fir.resolve.transformers.plugin.CompilerRequiredAnnotationsHelper import org.jetbrains.kotlin.fir.scopes.kotlinScopeProvider import org.jetbrains.kotlin.fir.types.FirUserTypeRef import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.transformSingle import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.name.StandardClassIds.Annotations.Deprecated -import org.jetbrains.kotlin.name.StandardClassIds.Annotations.DeprecatedSinceKotlin -import org.jetbrains.kotlin.name.StandardClassIds.Annotations.JvmRecord -import org.jetbrains.kotlin.name.StandardClassIds.Annotations.WasExperimental import org.jetbrains.kotlin.name.StandardClassIds.Annotations.SinceKotlin internal object FirLazyBodiesCalculator { @@ -211,13 +208,9 @@ private data class FirLazyAnnotationTransformerData( ) private object FirLazyAnnotationTransformer : FirTransformer() { - private val COMPILER_ANNOTATION_NAMES: Set = setOf( - Deprecated, - DeprecatedSinceKotlin, - WasExperimental, - JvmRecord, - SinceKotlin, - ).mapTo(mutableSetOf()) { it.shortClassName } + private val COMPILER_ANNOTATION_NAMES: Set = CompilerRequiredAnnotationsHelper.REQUIRED_ANNOTATIONS + .plus(SinceKotlin) + .mapTo(mutableSetOf()) { it.shortClassName } private fun canBeCompilerAnnotation(annotationCall: FirAnnotationCall, session: FirSession): Boolean { val annotationTypeRef = annotationCall.annotationTypeRef