From 30fa0230ec396cd9d38651cb9feb3d714891938d Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 1 Mar 2022 11:10:01 +0300 Subject: [PATCH] FIR: rename ANNOTATION_FOR_PLUGINS into COMPILER_REQUIRED_ANNOTATIONS --- .../api/fir/lazy/resolve/FirLazyDeclarationResolver.kt | 2 +- .../resolve/transformers/FirTotalResolveProcessor.kt | 2 +- ...irCompilerRequiredAnnotationsResolveTransformer.kt} | 10 +++++----- .../kotlin/fir/declarations/FirResolvePhase.kt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/{FirPluginAnnotationsResolveTransformer.kt => FirCompilerRequiredAnnotationsResolveTransformer.kt} (94%) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt index 8e6e2cd0b94..c3e90a3a3dc 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyDeclarationResolver.kt @@ -413,7 +413,7 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui } private fun skipPhaseInLazyResolve(currentPhase: FirResolvePhase): Boolean { - return currentPhase == FirResolvePhase.ANNOTATIONS_FOR_PLUGINS + return currentPhase == FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt index 8fb399a5972..0c6433063db 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt @@ -68,7 +68,7 @@ fun FirResolvePhase.createCompilerProcessorByPhase( ): FirResolveProcessor { return when (this) { RAW_FIR -> throw IllegalArgumentException("Raw FIR building phase does not have a transformer") - ANNOTATIONS_FOR_PLUGINS -> FirPluginAnnotationsResolveProcessor(session, scopeSession) + COMPILER_REQUIRED_ANNOTATIONS -> FirCompilerRequiredAnnotationsResolveProcessor(session, scopeSession) COMPANION_GENERATION -> FirCompanionGenerationProcessor(session, scopeSession) IMPORTS -> FirImportResolveProcessor(session, scopeSession) SUPER_TYPES -> FirSupertypeResolverProcessor(session, scopeSession) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirPluginAnnotationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirCompilerRequiredAnnotationsResolveTransformer.kt similarity index 94% rename from compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirPluginAnnotationsResolveTransformer.kt rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirCompilerRequiredAnnotationsResolveTransformer.kt index d3cdcc95bd9..7fb0a7e66db 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirPluginAnnotationsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirCompilerRequiredAnnotationsResolveTransformer.kt @@ -23,11 +23,11 @@ import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProviderInternals import org.jetbrains.kotlin.fir.resolve.transformers.* import org.jetbrains.kotlin.name.FqName -class FirPluginAnnotationsResolveProcessor( +class FirCompilerRequiredAnnotationsResolveProcessor( session: FirSession, scopeSession: ScopeSession ) : FirTransformerBasedResolveProcessor(session, scopeSession) { - override val transformer = FirPluginAnnotationsResolveTransformer(session, scopeSession) + override val transformer = FirCompilerRequiredAnnotationsResolveTransformer(session, scopeSession) @OptIn(FirSymbolProviderInternals::class) override fun beforePhase() { @@ -40,10 +40,10 @@ class FirPluginAnnotationsResolveProcessor( } } -class FirPluginAnnotationsResolveTransformer( +class FirCompilerRequiredAnnotationsResolveTransformer( override val session: FirSession, scopeSession: ScopeSession -) : FirAbstractPhaseTransformer(FirResolvePhase.ANNOTATIONS_FOR_PLUGINS) { +) : FirAbstractPhaseTransformer(FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) { private val annotationTransformer = FirAnnotationResolveTransformer(session, scopeSession) private val importTransformer = FirPartialImportResolveTransformer(session) @@ -83,7 +83,7 @@ class FirPluginAnnotationsResolveTransformer( private class FirPartialImportResolveTransformer( session: FirSession -) : FirImportResolveTransformer(session, FirResolvePhase.ANNOTATIONS_FOR_PLUGINS) { +) : FirImportResolveTransformer(session, FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) { var acceptableFqNames: Set = emptySet() override val FqName.isAcceptable: Boolean diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt index 00d1c1d863a..1e418e0ed20 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvePhase.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations enum class FirResolvePhase(val noProcessor: Boolean = false) { RAW_FIR(noProcessor = true), IMPORTS, - ANNOTATIONS_FOR_PLUGINS, + COMPILER_REQUIRED_ANNOTATIONS, COMPANION_GENERATION, SUPER_TYPES, SEALED_CLASS_INHERITORS,