azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR-PLUGIN] Fix compilation

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-05-18 16:05:51 +03:00
parent 3de12f9b09
commit 96802dde04
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenClassGenerator.kt
+3 -7
View File
@@ -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.extensions.AnnotationFqn
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.impl.FirProviderImpl
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
@@ -42,13 +44,7 @@ class AllOpenClassGenerator(session: FirSession) : FirClassGenerationExtension(s
return listOf(GeneratedClass(klass, containingFile))
}
override val directlyApplicableAnnotations: Set<AnnotationFqn> = setOf(FqName("org.jetbrains.kotlin.fir.plugin.WithClass"))
override val childrenApplicableAnnotations: Set<AnnotationFqn>
get() = emptySet()
override val metaAnnotations: Map<AnnotationFqn, MetaAnnotationMode>
get() = emptyMap()
override val predicate: DeclarationPredicate = has(FqName("org.jetbrains.kotlin.fir.plugin.WithClass"))
override val key: FirPluginKey
get() = AllOpenPluginKey
plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenStatusTransformer.kt
+2 -11
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus
import org.jetbrains.kotlin.fir.declarations.FirPluginKey
import org.jetbrains.kotlin.fir.extensions.AnnotationFqn
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.name.FqName
@@ -25,17 +26,7 @@ class AllOpenStatusTransformer(session: FirSession) : FirStatusTransformerExtens
return status.transform(modality = Modality.OPEN)
}
override val mode: Mode
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 predicate: DeclarationPredicate = hasOrUnder(ALL_OPEN) or metaHasOrUnder(ALL_OPEN)
override val key: FirPluginKey
get() = AllOpenPluginKey
plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/AbstractFirAllOpenDiagnosticTest.kt
+2 -2
View File
@@ -8,12 +8,12 @@ package org.jetbrains.kotlin.fir.plugin
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
import org.jetbrains.kotlin.config.CompilerConfiguration
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 java.io.File
abstract class AbstractFirAllOpenDiagnosticTest : AbstractFirDiagnosticsTest() {
override fun registerFirExtensions(service: FirOldExtensionsService) {
override fun registerFirExtensions(service: FirExtensionService) {
service.registerExtensions(FirAllOpenComponentRegistrar().configure())
}