From 793758a822ddce5a9388228f15c4506a2a22dc60 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Sun, 6 Feb 2022 03:45:19 +0300 Subject: [PATCH] [FIR] Remove factory methods from abstract providers --- .../jetbrains/kotlin/fir/session/ComponentsContainers.kt | 8 +++----- .../kotlin/fir/extensions/FirPredicateBasedProvider.kt | 6 ------ .../fir/extensions/FirRegisteredPluginAnnotations.kt | 8 +------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt index 543ad97a76b..7ae996181fd 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/ComponentsContainers.kt @@ -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)) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirPredicateBasedProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirPredicateBasedProvider.kt index 368deba304a..38a3a8baca5 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirPredicateBasedProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirPredicateBasedProvider.kt @@ -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> abstract fun getOwnersOfDeclaration(declaration: FirDeclaration): List>? diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirRegisteredPluginAnnotations.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirRegisteredPluginAnnotations.kt index 19c0419c0de..8d9abfff47b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirRegisteredPluginAnnotations.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirRegisteredPluginAnnotations.kt @@ -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 = mutableSetOf() override val metaAnnotations: MutableSet = mutableSetOf()