[FIR-PLUGIN] Fix compilation
This commit is contained in:
+3
-7
@@ -16,6 +16,8 @@ import org.jetbrains.kotlin.fir.declarations.builder.buildClassImpl
|
|||||||
import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl
|
import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl
|
||||||
import org.jetbrains.kotlin.fir.extensions.AnnotationFqn
|
import org.jetbrains.kotlin.fir.extensions.AnnotationFqn
|
||||||
import org.jetbrains.kotlin.fir.extensions.FirClassGenerationExtension
|
import org.jetbrains.kotlin.fir.extensions.FirClassGenerationExtension
|
||||||
|
import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate
|
||||||
|
import org.jetbrains.kotlin.fir.extensions.predicate.has
|
||||||
import org.jetbrains.kotlin.fir.resolve.firProvider
|
import org.jetbrains.kotlin.fir.resolve.firProvider
|
||||||
import org.jetbrains.kotlin.fir.resolve.impl.FirProviderImpl
|
import org.jetbrains.kotlin.fir.resolve.impl.FirProviderImpl
|
||||||
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
|
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
|
||||||
@@ -42,13 +44,7 @@ class AllOpenClassGenerator(session: FirSession) : FirClassGenerationExtension(s
|
|||||||
return listOf(GeneratedClass(klass, containingFile))
|
return listOf(GeneratedClass(klass, containingFile))
|
||||||
}
|
}
|
||||||
|
|
||||||
override val directlyApplicableAnnotations: Set<AnnotationFqn> = setOf(FqName("org.jetbrains.kotlin.fir.plugin.WithClass"))
|
override val predicate: DeclarationPredicate = has(FqName("org.jetbrains.kotlin.fir.plugin.WithClass"))
|
||||||
|
|
||||||
override val childrenApplicableAnnotations: Set<AnnotationFqn>
|
|
||||||
get() = emptySet()
|
|
||||||
|
|
||||||
override val metaAnnotations: Map<AnnotationFqn, MetaAnnotationMode>
|
|
||||||
get() = emptyMap()
|
|
||||||
|
|
||||||
override val key: FirPluginKey
|
override val key: FirPluginKey
|
||||||
get() = AllOpenPluginKey
|
get() = AllOpenPluginKey
|
||||||
|
|||||||
+2
-11
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus
|
|||||||
import org.jetbrains.kotlin.fir.declarations.FirPluginKey
|
import org.jetbrains.kotlin.fir.declarations.FirPluginKey
|
||||||
import org.jetbrains.kotlin.fir.extensions.AnnotationFqn
|
import org.jetbrains.kotlin.fir.extensions.AnnotationFqn
|
||||||
import org.jetbrains.kotlin.fir.extensions.FirStatusTransformerExtension
|
import org.jetbrains.kotlin.fir.extensions.FirStatusTransformerExtension
|
||||||
|
import org.jetbrains.kotlin.fir.extensions.predicate.*
|
||||||
import org.jetbrains.kotlin.fir.extensions.transform
|
import org.jetbrains.kotlin.fir.extensions.transform
|
||||||
import org.jetbrains.kotlin.name.FqName
|
import org.jetbrains.kotlin.name.FqName
|
||||||
|
|
||||||
@@ -25,17 +26,7 @@ class AllOpenStatusTransformer(session: FirSession) : FirStatusTransformerExtens
|
|||||||
return status.transform(modality = Modality.OPEN)
|
return status.transform(modality = Modality.OPEN)
|
||||||
}
|
}
|
||||||
|
|
||||||
override val mode: Mode
|
override val predicate: DeclarationPredicate = hasOrUnder(ALL_OPEN) or metaHasOrUnder(ALL_OPEN)
|
||||||
get() = Mode.ANNOTATED_ELEMENT
|
|
||||||
|
|
||||||
override val directlyApplicableAnnotations: Set<AnnotationFqn>
|
|
||||||
get() = setOf(ALL_OPEN)
|
|
||||||
|
|
||||||
override val childrenApplicableAnnotations: Set<AnnotationFqn>
|
|
||||||
get() = setOf(ALL_OPEN)
|
|
||||||
|
|
||||||
override val metaAnnotations: Map<AnnotationFqn, MetaAnnotationMode>
|
|
||||||
get() = mapOf(ALL_OPEN to MetaAnnotationMode.ANNOTATED_AND_CHILDREN)
|
|
||||||
|
|
||||||
override val key: FirPluginKey
|
override val key: FirPluginKey
|
||||||
get() = AllOpenPluginKey
|
get() = AllOpenPluginKey
|
||||||
|
|||||||
+2
-2
@@ -8,12 +8,12 @@ package org.jetbrains.kotlin.fir.plugin
|
|||||||
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
|
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
|
||||||
import org.jetbrains.kotlin.config.CompilerConfiguration
|
import org.jetbrains.kotlin.config.CompilerConfiguration
|
||||||
import org.jetbrains.kotlin.fir.AbstractFirDiagnosticsTest
|
import org.jetbrains.kotlin.fir.AbstractFirDiagnosticsTest
|
||||||
import org.jetbrains.kotlin.fir.extensions.FirOldExtensionsService
|
import org.jetbrains.kotlin.fir.extensions.FirExtensionService
|
||||||
import org.jetbrains.kotlin.fir.extensions.registerExtensions
|
import org.jetbrains.kotlin.fir.extensions.registerExtensions
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
abstract class AbstractFirAllOpenDiagnosticTest : AbstractFirDiagnosticsTest() {
|
abstract class AbstractFirAllOpenDiagnosticTest : AbstractFirDiagnosticsTest() {
|
||||||
override fun registerFirExtensions(service: FirOldExtensionsService) {
|
override fun registerFirExtensions(service: FirExtensionService) {
|
||||||
service.registerExtensions(FirAllOpenComponentRegistrar().configure())
|
service.registerExtensions(FirAllOpenComponentRegistrar().configure())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user