From 7f836ee6c35a796be11fb1919dbb1a8f943ef7c9 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 11 Oct 2021 17:03:15 +0300 Subject: [PATCH] [FIR] Remove `AllOpen` prefixes from fir plugin prototype entities --- .../kotlin/fir/plugin/AllOpenStatusTransformer.kt | 2 +- ...nsformer.kt => AllPublicVisibilityTransformer.kt} | 4 ++-- .../fir/plugin/FirAllOpenComponentRegistrar.kt | 12 ++++++------ ...tionalCheckers.kt => PluginAdditionalCheckers.kt} | 4 ++-- ...erator.kt => SomeAdditionalSupertypeGenerator.kt} | 4 ++-- .../plugin/{AllOpenPluginKey.kt => SomePluginKey.kt} | 2 +- .../kotlin/fir/plugin/checkers/DummyNameChecker.kt | 3 +-- .../checkers/{AllOpenErrors.kt => PluginErrors.kt} | 2 +- .../fir/plugin/checkers/SignedNumberCallChecker.kt | 2 +- ...ersGenerator.kt => AdditionalMembersGenerator.kt} | 2 +- ...enClassGenerator.kt => ExternalClassGenerator.kt} | 2 +- ...Generator.kt => TopLevelDeclarationsGenerator.kt} | 8 ++++---- .../plugin/types/FirNumberSignAttributeExtension.kt | 4 ++-- .../ir/plugin/GeneratedDeclarationsIrBodyFiller.kt | 6 +++--- 14 files changed, 28 insertions(+), 29 deletions(-) rename plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/{AllOpenVisibilityTransformer.kt => AllPublicVisibilityTransformer.kt} (96%) rename plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/{AllOpenAdditionalCheckers.kt => PluginAdditionalCheckers.kt} (91%) rename plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/{AllOpenSupertypeGenerator.kt => SomeAdditionalSupertypeGenerator.kt} (94%) rename plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/{AllOpenPluginKey.kt => SomePluginKey.kt} (90%) rename plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/{AllOpenErrors.kt => PluginErrors.kt} (96%) rename plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/{AllOpenMembersGenerator.kt => AdditionalMembersGenerator.kt} (97%) rename plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/{AllOpenClassGenerator.kt => ExternalClassGenerator.kt} (98%) rename plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/{AllOpenTopLevelDeclarationsGenerator.kt => TopLevelDeclarationsGenerator.kt} (94%) diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenStatusTransformer.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenStatusTransformer.kt index a823f316f06..7d6f01583ca 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenStatusTransformer.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenStatusTransformer.kt @@ -40,5 +40,5 @@ class AllOpenStatusTransformer(session: FirSession) : FirStatusTransformerExtens } override val key: FirPluginKey - get() = AllOpenPluginKey + get() = SomePluginKey } diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenVisibilityTransformer.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllPublicVisibilityTransformer.kt similarity index 96% rename from plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenVisibilityTransformer.kt rename to plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllPublicVisibilityTransformer.kt index 59bb5976a82..59ff28927d3 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenVisibilityTransformer.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllPublicVisibilityTransformer.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -class AllOpenVisibilityTransformer(session: FirSession) : FirStatusTransformerExtension(session) { +class AllPublicVisibilityTransformer(session: FirSession) : FirStatusTransformerExtension(session) { companion object { private val AllPublicClassId = ClassId(FqName("org.jetbrains.kotlin.fir.plugin"), Name.identifier("AllPublic")) private val VisibilityClassId = ClassId(FqName("org.jetbrains.kotlin.fir.plugin"), Name.identifier("Visibility")) @@ -81,5 +81,5 @@ class AllOpenVisibilityTransformer(session: FirSession) : FirStatusTransformerEx } override val key: FirPluginKey - get() = AllOpenPluginKey + get() = SomePluginKey } diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/FirAllOpenComponentRegistrar.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/FirAllOpenComponentRegistrar.kt index fb30f377f8e..286e2f41ee2 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/FirAllOpenComponentRegistrar.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/FirAllOpenComponentRegistrar.kt @@ -12,14 +12,14 @@ import org.jetbrains.kotlin.fir.plugin.types.FirNumberSignAttributeExtension class FirAllOpenComponentRegistrar : FirExtensionRegistrar() { override fun ExtensionRegistrarContext.configurePlugin() { +::AllOpenStatusTransformer - +::AllOpenVisibilityTransformer - +::AllOpenSupertypeGenerator - +::AllOpenAdditionalCheckers + +::AllPublicVisibilityTransformer + +::SomeAdditionalSupertypeGenerator + +::PluginAdditionalCheckers +::FirNumberSignAttributeExtension // Declaration generators - +::AllOpenTopLevelDeclarationsGenerator - +::AllOpenClassGenerator - +::AllOpenMembersGenerator + +::TopLevelDeclarationsGenerator + +::ExternalClassGenerator + +::AdditionalMembersGenerator } } diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenAdditionalCheckers.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/PluginAdditionalCheckers.kt similarity index 91% rename from plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenAdditionalCheckers.kt rename to plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/PluginAdditionalCheckers.kt index d3da070ec83..1972756de9b 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenAdditionalCheckers.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/PluginAdditionalCheckers.kt @@ -15,9 +15,9 @@ import org.jetbrains.kotlin.fir.declarations.FirPluginKey import org.jetbrains.kotlin.fir.plugin.checkers.DummyNameChecker import org.jetbrains.kotlin.fir.plugin.checkers.SignedNumberCallChecker -class AllOpenAdditionalCheckers(session: FirSession) : FirAdditionalCheckersExtension(session) { +class PluginAdditionalCheckers(session: FirSession) : FirAdditionalCheckersExtension(session) { override val key: FirPluginKey - get() = AllOpenPluginKey + get() = SomePluginKey override val declarationCheckers: DeclarationCheckers = object : DeclarationCheckers() { override val simpleFunctionCheckers: Set diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenSupertypeGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/SomeAdditionalSupertypeGenerator.kt similarity index 94% rename from plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenSupertypeGenerator.kt rename to plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/SomeAdditionalSupertypeGenerator.kt index c4b373f0a87..408fe70e642 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenSupertypeGenerator.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/SomeAdditionalSupertypeGenerator.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.name.Name /* * Adds MyInterface supertype for all classes annotated with @D */ -class AllOpenSupertypeGenerator(session: FirSession) : FirSupertypeGenerationExtension(session) { +class SomeAdditionalSupertypeGenerator(session: FirSession) : FirSupertypeGenerationExtension(session) { companion object { private val myInterfaceClassId = ClassId(FqName("foo"), Name.identifier("MyInterface")) private val PREDICATE: DeclarationPredicate = has("D".fqn()) @@ -44,7 +44,7 @@ class AllOpenSupertypeGenerator(session: FirSession) : FirSupertypeGenerationExt } override val key: FirPluginKey - get() = AllOpenPluginKey + get() = SomePluginKey override fun needTransformSupertypes(declaration: FirClassLikeDeclaration): Boolean { return session.predicateBasedProvider.matches(PREDICATE, declaration) diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenPluginKey.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/SomePluginKey.kt similarity index 90% rename from plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenPluginKey.kt rename to plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/SomePluginKey.kt index eafa09f159a..05e487bc46c 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenPluginKey.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/SomePluginKey.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.plugin import org.jetbrains.kotlin.fir.declarations.FirPluginKey -object AllOpenPluginKey : FirPluginKey() { +object SomePluginKey : FirPluginKey() { override fun toString(): String { return "AllOpenPlugin" } diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt index ce0e85c849c..8066cd1a16d 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/DummyNameChecker.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.plugin.checkers import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirSimpleFunctionChecker import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction @@ -16,7 +15,7 @@ object DummyNameChecker : FirSimpleFunctionChecker() { override fun check(declaration: FirSimpleFunction, context: CheckerContext, reporter: DiagnosticReporter) { val name = declaration.name.asString() if (name == "dummy") { - reporter.reportOn(declaration.source, AllOpenErrors.FUNCTION_WITH_DUMMY_NAME, name, context) + reporter.reportOn(declaration.source, PluginErrors.FUNCTION_WITH_DUMMY_NAME, name, context) } } } diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/AllOpenErrors.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/PluginErrors.kt similarity index 96% rename from plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/AllOpenErrors.kt rename to plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/PluginErrors.kt index 5922a40ab77..32fb3a31099 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/AllOpenErrors.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/PluginErrors.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.SourceElementPositioningStr import org.jetbrains.kotlin.fir.analysis.diagnostics.error2 import org.jetbrains.kotlin.fir.analysis.diagnostics.warning1 -object AllOpenErrors { +object PluginErrors { val FUNCTION_WITH_DUMMY_NAME by warning1(SourceElementPositioningStrategies.DECLARATION_NAME) val ILLEGAL_NUMBER_SIGN by error2() } diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/SignedNumberCallChecker.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/SignedNumberCallChecker.kt index a587f645ede..343e1a957d5 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/SignedNumberCallChecker.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/checkers/SignedNumberCallChecker.kt @@ -26,7 +26,7 @@ object SignedNumberCallChecker : FirFunctionCallChecker() { val actualSign = argument.typeRef.coneType.attributes.numberSign if (expectedSign != actualSign) { withSuppressedDiagnostics(argument, context) { - reporter.reportOn(argument.source, AllOpenErrors.ILLEGAL_NUMBER_SIGN, expectedSign.asString(), actualSign.asString(), it) + reporter.reportOn(argument.source, PluginErrors.ILLEGAL_NUMBER_SIGN, expectedSign.asString(), actualSign.asString(), it) } } } diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMembersGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AdditionalMembersGenerator.kt similarity index 97% rename from plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMembersGenerator.kt rename to plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AdditionalMembersGenerator.kt index 276b500b541..f2a6d298fd9 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenMembersGenerator.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AdditionalMembersGenerator.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.name.Name * - member fun materialize(): ClassName * - nested class Nested with default constructor */ -class AllOpenMembersGenerator(session: FirSession) : FirDeclarationGenerationExtension(session) { +class AdditionalMembersGenerator(session: FirSession) : FirDeclarationGenerationExtension(session) { companion object { private val MATERIALIZE_NAME = Name.identifier("materialize") private val NESTED_NAME = Name.identifier("Nested") diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenClassGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/ExternalClassGenerator.kt similarity index 98% rename from plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenClassGenerator.kt rename to plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/ExternalClassGenerator.kt index 658e05b79d0..a83baf84148 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenClassGenerator.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/ExternalClassGenerator.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.name.Name * * If there are no annotated classes then AllOpenGenerated class is not generated */ -class AllOpenClassGenerator(session: FirSession) : FirDeclarationGenerationExtension(session) { +class ExternalClassGenerator(session: FirSession) : FirDeclarationGenerationExtension(session) { companion object { private val FOO_PACKAGE = FqName.topLevel(Name.identifier("foo")) private val GENERATED_CLASS_ID = ClassId(FOO_PACKAGE, Name.identifier("AllOpenGenerated")) diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/TopLevelDeclarationsGenerator.kt similarity index 94% rename from plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt rename to plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/TopLevelDeclarationsGenerator.kt index 7edfeef4e9e..65dbbc4ffd2 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenTopLevelDeclarationsGenerator.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/TopLevelDeclarationsGenerator.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate import org.jetbrains.kotlin.fir.extensions.predicate.has import org.jetbrains.kotlin.fir.extensions.predicateBasedProvider import org.jetbrains.kotlin.fir.moduleData -import org.jetbrains.kotlin.fir.plugin.AllOpenPluginKey +import org.jetbrains.kotlin.fir.plugin.SomePluginKey import org.jetbrains.kotlin.fir.plugin.fqn import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.Name /* * Generates `dummyClassName(value: ClassName): String` function for each class annotated with @A */ -class AllOpenTopLevelDeclarationsGenerator(session: FirSession) : FirDeclarationGenerationExtension(session) { +class TopLevelDeclarationsGenerator(session: FirSession) : FirDeclarationGenerationExtension(session) { companion object { private val PREDICATE: DeclarationPredicate = has("A".fqn()) } @@ -90,8 +90,8 @@ class AllOpenTopLevelDeclarationsGenerator(session: FirSession) : FirDeclaration } } - override val key: AllOpenPluginKey - get() = AllOpenPluginKey + override val key: SomePluginKey + get() = SomePluginKey override fun needToGenerateAdditionalMembersInClass(klass: FirClass): Boolean { return false diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/types/FirNumberSignAttributeExtension.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/types/FirNumberSignAttributeExtension.kt index 0981043c85a..47d587cb8c3 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/types/FirNumberSignAttributeExtension.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/types/FirNumberSignAttributeExtension.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotation import org.jetbrains.kotlin.fir.expressions.impl.FirEmptyAnnotationArgumentMapping import org.jetbrains.kotlin.fir.extensions.FirTypeAttributeExtension -import org.jetbrains.kotlin.fir.plugin.AllOpenPluginKey +import org.jetbrains.kotlin.fir.plugin.SomePluginKey import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.types.ConeAttribute import org.jetbrains.kotlin.fir.types.ConeClassLikeType @@ -31,7 +31,7 @@ class FirNumberSignAttributeExtension(session: FirSession) : FirTypeAttributeExt } override val key: FirPluginKey - get() = AllOpenPluginKey + get() = SomePluginKey override fun extractAttributeFromAnnotation(annotation: FirAnnotation): ConeAttribute<*>? { val sign = when (annotation.annotationTypeRef.coneTypeSafe()?.classId) { diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/GeneratedDeclarationsIrBodyFiller.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/GeneratedDeclarationsIrBodyFiller.kt index c2b63259688..11aa55f4848 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/GeneratedDeclarationsIrBodyFiller.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/ir/plugin/GeneratedDeclarationsIrBodyFiller.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ir.plugin import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.fir.backend.IrPluginDeclarationOrigin -import org.jetbrains.kotlin.fir.plugin.generators.AllOpenClassGenerator +import org.jetbrains.kotlin.fir.plugin.generators.ExternalClassGenerator import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl @@ -41,7 +41,7 @@ private class Transformer(val context: IrPluginContext) : IrElementVisitorVoid { override fun visitSimpleFunction(declaration: IrSimpleFunction) { val origin = declaration.origin - if (origin !is IrPluginDeclarationOrigin || origin.pluginKey != AllOpenClassGenerator.Key) return + if (origin !is IrPluginDeclarationOrigin || origin.pluginKey != ExternalClassGenerator.Key) return require(declaration.body == null) val constructedType = declaration.returnType as? IrSimpleType ?: return val constructedClassSymbol = constructedType.classifier @@ -62,7 +62,7 @@ private class Transformer(val context: IrPluginContext) : IrElementVisitorVoid { override fun visitConstructor(declaration: IrConstructor) { val origin = declaration.origin - if (origin !is IrPluginDeclarationOrigin || origin.pluginKey != AllOpenClassGenerator.Key) return + if (origin !is IrPluginDeclarationOrigin || origin.pluginKey != ExternalClassGenerator.Key) return require(declaration.body == null) val type = declaration.returnType as? IrSimpleType ?: return