[FIR] Allow all extensions register declaration predicates

compiler/fir/providers/src/org/jetbrains/kotlin/fir/extensions/FirDeclarationGenerationExtension.kt

@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.caches.FirCache
 import org.jetbrains.kotlin.fir.caches.FirLazyValue
 import org.jetbrains.kotlin.fir.caches.firCachesFactory
-import org.jetbrains.kotlin.fir.declarations.FirClass
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
@@ -21,7 +20,7 @@ import kotlin.reflect.KClass
  * TODO:
  *  - check that annotations or meta-annotations is not empty
  */
-abstract class FirDeclarationGenerationExtension(session: FirSession) : FirPredicateBasedExtension(session) {
+abstract class FirDeclarationGenerationExtension(session: FirSession) : FirExtension(session) {
     companion object {
         val NAME = FirExtensionPointName("ExistingClassModification")
     }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirRegisteredPluginAnnotations.kt

@@ -23,6 +23,10 @@ abstract class FirRegisteredPluginAnnotations(val session: FirSession) : FirSess
 
     abstract val annotations: Set<AnnotationFqn>
     abstract val metaAnnotations: Set<AnnotationFqn>
+
+    val hasRegisteredAnnotations: Boolean
+        get() = annotations.isNotEmpty() || metaAnnotations.isNotEmpty()
+
     abstract fun getAnnotationsWithMetaAnnotation(metaAnnotation: AnnotationFqn): Collection<AnnotationFqn>
 
     abstract fun registerUserDefinedAnnotation(metaAnnotation: AnnotationFqn, annotationClasses: Collection<FirRegularClass>)
@@ -80,7 +84,6 @@ private class FirRegisteredPluginAnnotationsImpl(session: FirSession) : FirRegis
         }
 
         for (extension in session.extensionService.getAllExtensions()) {
-            if (extension !is FirPredicateBasedExtension) continue
             with(extension) {
                 registrar.registerPredicates()
             }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirStatusTransformerExtension.kt

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
 import kotlin.reflect.KClass
 
-abstract class FirStatusTransformerExtension(session: FirSession) : FirPredicateBasedExtension(session) {
+abstract class FirStatusTransformerExtension(session: FirSession) : FirExtension(session) {
     companion object {
         val NAME = FirExtensionPointName("StatusTransformer")
     }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirSupertypeGenerationExtension.kt

@@ -8,10 +8,9 @@ package org.jetbrains.kotlin.fir.extensions
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
-import org.jetbrains.kotlin.fir.types.FirTypeRef
 import kotlin.reflect.KClass
 
-abstract class FirSupertypeGenerationExtension(session: FirSession) : FirPredicateBasedExtension(session) {
+abstract class FirSupertypeGenerationExtension(session: FirSession) : FirExtension(session) {
     companion object {
         val NAME = FirExtensionPointName("SupertypeGenerator")
     }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirPluginAnnotationsResolveTransformer.kt

@@ -54,8 +54,8 @@ class FirPluginAnnotationsResolveTransformer(
 
     override fun transformFile(file: FirFile, data: Any?): FirFile {
         checkSessionConsistency(file)
-        if (!extensionService.hasPredicateBasedExtensions) return file
         val registeredPluginAnnotations = session.registeredPluginAnnotations
+        if (!registeredPluginAnnotations.hasRegisteredAnnotations) return file
         val newAnnotations = file.resolveAnnotations(registeredPluginAnnotations.annotations, registeredPluginAnnotations.metaAnnotations)
         if (!newAnnotations.isEmpty) {
             for (metaAnnotation in newAnnotations.keySet()) {

compiler/fir/tree/src/org/jetbrains/kotlin/fir/extensions/FirExtension.kt

@@ -31,10 +31,8 @@ abstract class FirExtension(val session: FirSession) {
     fun interface Factory<out P : FirExtension> {
         fun create(session: FirSession): P
     }
-}
 
-abstract class FirPredicateBasedExtension(session: FirSession) : FirExtension(session) {
+    open fun FirDeclarationPredicateRegistrar.registerPredicates() {}
-    abstract fun FirDeclarationPredicateRegistrar.registerPredicates()
 }
 
 data class FirExtensionPointName(val name: Name) {

compiler/fir/tree/src/org/jetbrains/kotlin/fir/extensions/FirExtensionService.kt

@@ -36,14 +36,10 @@ class FirExtensionService(val session: FirSession) : ComponentArrayOwner<FirExte
     var registeredExtensionsSize: Int = 0
         private set
 
-    var registeredPredicateBasedExtensionsSize: Int = 0
-        private set
-
     @PluginServicesInitialization
     fun registerExtensions(extensionClass: KClass<out FirExtension>, extensionFactories: List<FirExtension.Factory<*>>) {
         registeredExtensionsSize += extensionFactories.size
         val extensions = extensionFactories.map { it.create(session) }
-        registeredPredicateBasedExtensionsSize += extensions.count { it is FirPredicateBasedExtension }
         registerComponent(
             extensionClass,
             extensions
@@ -60,6 +56,3 @@ val FirSession.extensionService: FirExtensionService by FirSession.sessionCompon
 
 val FirExtensionService.hasExtensions: Boolean
     get() = registeredExtensionsSize > 0
-
-val FirExtensionService.hasPredicateBasedExtensions: Boolean
-    get() = registeredPredicateBasedExtensionsSize > 0