FIR: rename ANNOTATION_FOR_PLUGINS into COMPILER_REQUIRED_ANNOTATIONS

This commit is contained in:
Mikhail Glukhikh
2022-03-01 11:10:01 +03:00
committed by Space
parent f32cdef760
commit 30fa0230ec
4 changed files with 8 additions and 8 deletions
@@ -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
}
}
@@ -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)
@@ -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<Any?>(FirResolvePhase.ANNOTATIONS_FOR_PLUGINS) {
) : FirAbstractPhaseTransformer<Any?>(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<FqName> = emptySet()
override val FqName.isAcceptable: Boolean
@@ -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,