From 6af3b289a34cf38209f7fd9e318edab304e421f3 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Thu, 7 May 2020 14:46:29 +0300 Subject: [PATCH] [FIR-PLUGIN] Add plugin key to allopen extensions --- .../jetbrains/kotlin/fir/allopen/AllOpenClassGenerator.kt | 8 ++++---- .../org/jetbrains/kotlin/fir/allopen/AllOpenPluginKey.kt | 4 ++-- .../kotlin/fir/allopen/AllOpenStatusTransformer.kt | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenClassGenerator.kt b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenClassGenerator.kt index d0f972dc5ab..e73e44403f9 100644 --- a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenClassGenerator.kt +++ b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenClassGenerator.kt @@ -12,10 +12,7 @@ import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirEffectiveVisibility import org.jetbrains.kotlin.fir.FirEffectiveVisibilityImpl import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirRegularClass +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.buildClassImpl import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.extensions.AnnotationFqn @@ -53,4 +50,7 @@ class AllOpenClassGenerator(session: FirSession) : FirClassGenerationExtension(s override val metaAnnotations: Map get() = emptyMap() + + override val key: FirPluginKey + get() = AllOpenPluginKey } \ No newline at end of file diff --git a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenPluginKey.kt b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenPluginKey.kt index 719a615d562..37dd68ff582 100644 --- a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenPluginKey.kt +++ b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenPluginKey.kt @@ -5,6 +5,6 @@ package org.jetbrains.kotlin.fir.allopen -import org.jetbrains.kotlin.fir.declarations.FirPluginMarker +import org.jetbrains.kotlin.fir.declarations.FirPluginKey -object AllOpenPluginKey : FirPluginMarker() \ No newline at end of file +object AllOpenPluginKey : FirPluginKey() \ No newline at end of file diff --git a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenStatusTransformer.kt b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenStatusTransformer.kt index 0feaaa6edd6..2b30f10841a 100644 --- a/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenStatusTransformer.kt +++ b/compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenStatusTransformer.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirDeclaration 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.transform @@ -35,4 +36,7 @@ class AllOpenStatusTransformer(session: FirSession) : FirStatusTransformerExtens override val metaAnnotations: Map get() = mapOf(ALL_OPEN to MetaAnnotationMode.ANNOTATED_AND_CHILDREN) + + override val key: FirPluginKey + get() = AllOpenPluginKey } \ No newline at end of file