FIR: rename ANNOTATION_FOR_PLUGINS into COMPILER_REQUIRED_ANNOTATIONS
This commit is contained in:
+1
-1
@@ -413,7 +413,7 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun skipPhaseInLazyResolve(currentPhase: FirResolvePhase): Boolean {
|
private fun skipPhaseInLazyResolve(currentPhase: FirResolvePhase): Boolean {
|
||||||
return currentPhase == FirResolvePhase.ANNOTATIONS_FOR_PLUGINS
|
return currentPhase == FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -68,7 +68,7 @@ fun FirResolvePhase.createCompilerProcessorByPhase(
|
|||||||
): FirResolveProcessor {
|
): FirResolveProcessor {
|
||||||
return when (this) {
|
return when (this) {
|
||||||
RAW_FIR -> throw IllegalArgumentException("Raw FIR building phase does not have a transformer")
|
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)
|
COMPANION_GENERATION -> FirCompanionGenerationProcessor(session, scopeSession)
|
||||||
IMPORTS -> FirImportResolveProcessor(session, scopeSession)
|
IMPORTS -> FirImportResolveProcessor(session, scopeSession)
|
||||||
SUPER_TYPES -> FirSupertypeResolverProcessor(session, scopeSession)
|
SUPER_TYPES -> FirSupertypeResolverProcessor(session, scopeSession)
|
||||||
|
|||||||
+5
-5
@@ -23,11 +23,11 @@ import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProviderInternals
|
|||||||
import org.jetbrains.kotlin.fir.resolve.transformers.*
|
import org.jetbrains.kotlin.fir.resolve.transformers.*
|
||||||
import org.jetbrains.kotlin.name.FqName
|
import org.jetbrains.kotlin.name.FqName
|
||||||
|
|
||||||
class FirPluginAnnotationsResolveProcessor(
|
class FirCompilerRequiredAnnotationsResolveProcessor(
|
||||||
session: FirSession,
|
session: FirSession,
|
||||||
scopeSession: ScopeSession
|
scopeSession: ScopeSession
|
||||||
) : FirTransformerBasedResolveProcessor(session, scopeSession) {
|
) : FirTransformerBasedResolveProcessor(session, scopeSession) {
|
||||||
override val transformer = FirPluginAnnotationsResolveTransformer(session, scopeSession)
|
override val transformer = FirCompilerRequiredAnnotationsResolveTransformer(session, scopeSession)
|
||||||
|
|
||||||
@OptIn(FirSymbolProviderInternals::class)
|
@OptIn(FirSymbolProviderInternals::class)
|
||||||
override fun beforePhase() {
|
override fun beforePhase() {
|
||||||
@@ -40,10 +40,10 @@ class FirPluginAnnotationsResolveProcessor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class FirPluginAnnotationsResolveTransformer(
|
class FirCompilerRequiredAnnotationsResolveTransformer(
|
||||||
override val session: FirSession,
|
override val session: FirSession,
|
||||||
scopeSession: ScopeSession
|
scopeSession: ScopeSession
|
||||||
) : FirAbstractPhaseTransformer<Any?>(FirResolvePhase.ANNOTATIONS_FOR_PLUGINS) {
|
) : FirAbstractPhaseTransformer<Any?>(FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) {
|
||||||
private val annotationTransformer = FirAnnotationResolveTransformer(session, scopeSession)
|
private val annotationTransformer = FirAnnotationResolveTransformer(session, scopeSession)
|
||||||
private val importTransformer = FirPartialImportResolveTransformer(session)
|
private val importTransformer = FirPartialImportResolveTransformer(session)
|
||||||
|
|
||||||
@@ -83,7 +83,7 @@ class FirPluginAnnotationsResolveTransformer(
|
|||||||
|
|
||||||
private class FirPartialImportResolveTransformer(
|
private class FirPartialImportResolveTransformer(
|
||||||
session: FirSession
|
session: FirSession
|
||||||
) : FirImportResolveTransformer(session, FirResolvePhase.ANNOTATIONS_FOR_PLUGINS) {
|
) : FirImportResolveTransformer(session, FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) {
|
||||||
var acceptableFqNames: Set<FqName> = emptySet()
|
var acceptableFqNames: Set<FqName> = emptySet()
|
||||||
|
|
||||||
override val FqName.isAcceptable: Boolean
|
override val FqName.isAcceptable: Boolean
|
||||||
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations
|
|||||||
enum class FirResolvePhase(val noProcessor: Boolean = false) {
|
enum class FirResolvePhase(val noProcessor: Boolean = false) {
|
||||||
RAW_FIR(noProcessor = true),
|
RAW_FIR(noProcessor = true),
|
||||||
IMPORTS,
|
IMPORTS,
|
||||||
ANNOTATIONS_FOR_PLUGINS,
|
COMPILER_REQUIRED_ANNOTATIONS,
|
||||||
COMPANION_GENERATION,
|
COMPANION_GENERATION,
|
||||||
SUPER_TYPES,
|
SUPER_TYPES,
|
||||||
SEALED_CLASS_INHERITORS,
|
SEALED_CLASS_INHERITORS,
|
||||||
|
|||||||
Reference in New Issue
Block a user