Combined ClassBuilderInterceptorExtensionImpl, NativeIrGenerationExtension and JsSyntheticTranslateExtensionExt into ProcessorFinishedDetectorImpl

Author: Foso

kotlin-compiler-native-plugin/src/main/java/de/jensklingenberg/common/NativeTestComponentRegistrar.kt

@@ -8,7 +8,6 @@ import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
-import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension
 
 
 /**

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/common/MpAptProject.kt

@@ -1,20 +1,14 @@
 package de.jensklingenberg.mpapt.common
 
-import de.jensklingenberg.mpapt.extension.ClassBuilderInterceptorExtensionImpl
-import de.jensklingenberg.mpapt.extension.NativeIrGenerationExtension
+import de.jensklingenberg.mpapt.extension.ProcessorFinishedDetector
+import de.jensklingenberg.mpapt.extension.ProcessorFinishedDetectorImpl
 import de.jensklingenberg.mpapt.extension.StorageComponentContainerContributorImpl
-import de.jensklingenberg.mpapt.extension.js.JsSyntheticTranslateExtensionExt
 import de.jensklingenberg.mpapt.model.AbstractProcessor
-import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
-import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
-import org.jetbrains.kotlin.js.translate.extensions.JsSyntheticTranslateExtension
 
 class MpAptProject(abstractProcessor: AbstractProcessor, configuration: CompilerConfiguration) :
-        IrGenerationExtension by NativeIrGenerationExtension(abstractProcessor),
-        JsSyntheticTranslateExtension by JsSyntheticTranslateExtensionExt(abstractProcessor),
-        ClassBuilderInterceptorExtension by ClassBuilderInterceptorExtensionImpl(abstractProcessor),
+        ProcessorFinishedDetector by ProcessorFinishedDetectorImpl(abstractProcessor),
         StorageComponentContainerContributor by StorageComponentContainerContributorImpl(abstractProcessor)
 {
     init {

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/extension/ClassBuilderInterceptorExtensionImpl.kt

@@ -39,7 +39,6 @@ class DeclarationCheckerImpl(private val processor: AbstractProcessor) : Declara
                             )
                     )
                     processor.process(roundEnvironment)
-
                 }
             }
 

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/extension/DeclarationCheckerImpl.kt

@@ -0,0 +1,7 @@
+package de.jensklingenberg.mpapt.extension
+
+import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
+import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
+import org.jetbrains.kotlin.js.translate.extensions.JsSyntheticTranslateExtension
+
+interface ProcessorFinishedDetector : IrGenerationExtension, JsSyntheticTranslateExtension, ClassBuilderInterceptorExtension

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/extension/NativeIrGenerationExtension.kt

@@ -0,0 +1,64 @@
+package de.jensklingenberg.mpapt.extension
+
+import de.jensklingenberg.mpapt.model.Processor
+import org.jetbrains.kotlin.backend.common.BackendContext
+import org.jetbrains.kotlin.codegen.ClassBuilder
+import org.jetbrains.kotlin.codegen.ClassBuilderFactory
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.diagnostics.DiagnosticSink
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.js.translate.context.TranslationContext
+import org.jetbrains.kotlin.js.translate.declaration.DeclarationBodyVisitor
+import org.jetbrains.kotlin.psi.KtPureClassOrObject
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
+
+/**
+ * This class is used to detect that the [DeclarationCheckerImpl] is finished with processing
+ *
+ */
+class ProcessorFinishedDetectorImpl(val processor: Processor) : ProcessorFinishedDetector {
+
+
+    /**
+     * This is used to detect that the [DeclarationCheckerImpl] is finished with processing on Kotlin Native
+     */
+    override fun generate(file: IrFile, backendContext: BackendContext, bindingContext: BindingContext) {
+        if (processor.isTargetPlatformSupported()) {
+            processor.onProcessingOver()
+        }
+    }
+
+    /**
+     * This is used to detect that the [DeclarationCheckerImpl] is finished with processing on KotlinJS
+     */
+    override fun generateClassSyntheticParts(
+            declaration: KtPureClassOrObject,
+            descriptor: ClassDescriptor,
+            translator: DeclarationBodyVisitor,
+            context: TranslationContext
+    ) {
+        if (processor.isTargetPlatformSupported()) {
+            processor.onProcessingOver()
+        }
+    }
+
+    /**
+     * This is used to detect that the [DeclarationCheckerImpl] is finished with processing on KotlinJVM
+     */
+    override fun interceptClassBuilderFactory(
+            interceptedFactory: ClassBuilderFactory,
+            bindingContext: BindingContext,
+            diagnostics: DiagnosticSink
+    ): ClassBuilderFactory = object : ClassBuilderFactory by interceptedFactory {
+
+        override fun newClassBuilder(origin: JvmDeclarationOrigin): ClassBuilder {
+            if (processor.isTargetPlatformSupported()) {
+                processor.onProcessingOver()
+            }
+
+            return interceptedFactory.newClassBuilder(origin)
+        }
+    }
+}
+

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/extension/ProcessorFinishedDetector.kt

@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
 import org.jetbrains.kotlin.platform.TargetPlatform
 
-class StorageComponentContainerContributorImpl(val processor: AbstractProcessor) : StorageComponentContainerContributor {
+class StorageComponentContainerContributorImpl(private val processor: AbstractProcessor) : StorageComponentContainerContributor {
 
     /**
      * Here we get the targetplatform of the module

mpapt-runtime/src/main/java/de/jensklingenberg/mpapt/extension/ProcessorFinishedDetectorImpl.kt

@@ -1,4 +1,4 @@
-enableFeaturePreview("GRADLE_METADATA")
+
 include 'annotations'
 include 'example'
 include ':kotlin-compiler-native-plugin'