[FIR] Remove factory methods from abstract providers
This commit is contained in:
+3
-5
@@ -19,9 +19,7 @@ import org.jetbrains.kotlin.fir.caches.FirCachesFactory
|
||||
import org.jetbrains.kotlin.fir.caches.FirThreadUnsafeCachesFactory
|
||||
import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProvider
|
||||
import org.jetbrains.kotlin.fir.declarations.SealedClassInheritorsProviderImpl
|
||||
import org.jetbrains.kotlin.fir.extensions.FirExtensionService
|
||||
import org.jetbrains.kotlin.fir.extensions.FirPredicateBasedProvider
|
||||
import org.jetbrains.kotlin.fir.extensions.FirRegisteredPluginAnnotations
|
||||
import org.jetbrains.kotlin.fir.extensions.*
|
||||
import org.jetbrains.kotlin.fir.java.FirJavaVisibilityChecker
|
||||
import org.jetbrains.kotlin.fir.java.FirJvmDefaultModeComponent
|
||||
import org.jetbrains.kotlin.fir.java.enhancement.FirAnnotationTypeQualifierResolver
|
||||
@@ -58,8 +56,8 @@ fun FirSession.registerCommonComponents(languageVersionSettings: LanguageVersion
|
||||
register(FirDefaultParametersResolver::class, FirDefaultParametersResolver())
|
||||
|
||||
register(FirExtensionService::class, FirExtensionService(this))
|
||||
register(FirRegisteredPluginAnnotations::class, FirRegisteredPluginAnnotations.create(this))
|
||||
register(FirPredicateBasedProvider::class, FirPredicateBasedProvider.create(this))
|
||||
register(FirRegisteredPluginAnnotations::class, FirRegisteredPluginAnnotationsImpl(this))
|
||||
register(FirPredicateBasedProvider::class, FirPredicateBasedProviderImpl(this))
|
||||
register(GeneratedClassIndex::class, GeneratedClassIndex.create())
|
||||
|
||||
register(FirSubstitutionOverrideStorage::class, FirSubstitutionOverrideStorage(this))
|
||||
|
||||
-6
@@ -18,12 +18,6 @@ import org.jetbrains.kotlin.fir.resolve.fqName
|
||||
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
|
||||
|
||||
abstract class FirPredicateBasedProvider : FirSessionComponent {
|
||||
companion object {
|
||||
fun create(session: FirSession): FirPredicateBasedProvider {
|
||||
return FirPredicateBasedProviderImpl(session)
|
||||
}
|
||||
}
|
||||
|
||||
abstract fun getSymbolsByPredicate(predicate: DeclarationPredicate): List<FirBasedSymbol<*>>
|
||||
abstract fun getOwnersOfDeclaration(declaration: FirDeclaration): List<FirBasedSymbol<*>>?
|
||||
|
||||
|
||||
+1
-7
@@ -15,12 +15,6 @@ import org.jetbrains.kotlin.fir.declarations.FirRegularClass
|
||||
import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate
|
||||
|
||||
abstract class FirRegisteredPluginAnnotations(val session: FirSession) : FirSessionComponent {
|
||||
companion object {
|
||||
fun create(session: FirSession): FirRegisteredPluginAnnotations {
|
||||
return FirRegisteredPluginAnnotationsImpl(session)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Contains all annotations that can be targeted by the plugins. It includes the annotations directly mentioned by the plugin,
|
||||
* and all the user-defined annotations which are meta-annotated by the annotations from the [metaAnnotations] list.
|
||||
@@ -46,7 +40,7 @@ abstract class FirRegisteredPluginAnnotations(val session: FirSession) : FirSess
|
||||
}
|
||||
|
||||
@NoMutableState
|
||||
private class FirRegisteredPluginAnnotationsImpl(session: FirSession) : FirRegisteredPluginAnnotations(session) {
|
||||
class FirRegisteredPluginAnnotationsImpl(session: FirSession) : FirRegisteredPluginAnnotations(session) {
|
||||
override val annotations: MutableSet<AnnotationFqn> = mutableSetOf()
|
||||
override val metaAnnotations: MutableSet<AnnotationFqn> = mutableSetOf()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user