[Plugins] Introduce new API for registering compiler plugins

Original `ComponentRegistrar` exposes Project to its registration method, so plugins should manually register extensions to it. To prepare for possible unbound compiler from Project API in future new `K2ComponentRegistrar` introduced which provides registration method without Project at all
2022-06-07 10:23:09 +03:00
parent bb996c1b27
commit 8b42638afa
56 changed files with 392 additions and 191 deletions
@@ -37,6 +37,7 @@ dependencies {
    testApi(projectTests(":compiler:test-infrastructure-utils"))

    // FIR dependencies
+    testApi(project(":compiler:fir:entrypoint"))
    testApi(project(":compiler:fir:checkers"))
    testApi(project(":compiler:fir:checkers:checkers.jvm"))
    testApi(project(":compiler:fir:checkers:checkers.js"))
@@ -12,6 +12,7 @@ dependencies {
    api(project(":plugins:parcelize:parcelize-compiler:parcelize.backend"))

    compileOnly(project(":compiler:plugin-api"))
+    compileOnly(project(":compiler:fir:entrypoint"))
    compileOnly(project(":compiler:backend"))
    compileOnly(project(":compiler:ir.backend.common"))
    compileOnly(intellijCore())
@@ -5,34 +5,35 @@

 package org.jetbrains.kotlin.parcelize

-import com.intellij.mock.MockProject
-import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
 import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
 import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
-import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
+import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.container.StorageComponentContainer
 import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
+import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
+import org.jetbrains.kotlin.parcelize.fir.FirParcelizeExtensionRegistrar
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.jvm.isJvm
 import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension

-class ParcelizeComponentRegistrar : ComponentRegistrar {
+class ParcelizeComponentRegistrar : CompilerPluginRegistrar() {
    companion object {
-        fun registerParcelizeComponents(project: Project) {
-            ExpressionCodegenExtension.registerExtension(project, ParcelizeCodegenExtension())
-            IrGenerationExtension.registerExtension(project, ParcelizeIrGeneratorExtension())
-            SyntheticResolveExtension.registerExtension(project, ParcelizeResolveExtension())
-            ClassBuilderInterceptorExtension.registerExtension(project, ParcelizeClinitClassBuilderInterceptorExtension())
-            StorageComponentContainerContributor.registerExtension(project, ParcelizeDeclarationCheckerComponentContainerContributor())
+        fun registerParcelizeComponents(extensionStorage: ExtensionStorage) = with(extensionStorage) {
+            ExpressionCodegenExtension.registerExtension(ParcelizeCodegenExtension())
+            IrGenerationExtension.registerExtension(ParcelizeIrGeneratorExtension())
+            SyntheticResolveExtension.registerExtension(ParcelizeResolveExtension())
+            ClassBuilderInterceptorExtension.registerExtension(ParcelizeClinitClassBuilderInterceptorExtension())
+            StorageComponentContainerContributor.registerExtension(ParcelizeDeclarationCheckerComponentContainerContributor())
+            FirExtensionRegistrarAdapter.registerExtension(FirParcelizeExtensionRegistrar())
        }
    }

-    override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
-        registerParcelizeComponents(project)
+    override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
+        registerParcelizeComponents(this)
    }

    override val supportsK2: Boolean
@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.parcelize.test.runners

 import org.jetbrains.kotlin.parcelize.test.services.ParcelizeEnvironmentConfigurator
-import org.jetbrains.kotlin.test.bind
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
 import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor
@@ -23,7 +22,7 @@ abstract class AbstractFirParcelizeDiagnosticTest : AbstractKotlinCompilerTest()
            +FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
        }

-        useConfigurators(::ParcelizeEnvironmentConfigurator.bind(true))
+        useConfigurators(::ParcelizeEnvironmentConfigurator)

        useAfterAnalysisCheckers(
            ::FirIdenticalChecker,
@@ -5,7 +5,10 @@

 package org.jetbrains.kotlin.parcelize.test.runners

-import org.jetbrains.kotlin.parcelize.test.services.*
+import org.jetbrains.kotlin.parcelize.test.services.ParcelizeEnvironmentConfigurator
+import org.jetbrains.kotlin.parcelize.test.services.ParcelizeMainClassProvider
+import org.jetbrains.kotlin.parcelize.test.services.ParcelizeRuntimeClasspathProvider
+import org.jetbrains.kotlin.parcelize.test.services.ParcelizeUtilSourcesProvider
 import org.jetbrains.kotlin.test.Constructor
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
@@ -14,8 +17,10 @@ import org.jetbrains.kotlin.test.backend.classic.ClassicJvmBackendFacade
 import org.jetbrains.kotlin.test.backend.handlers.IrTextDumpHandler
 import org.jetbrains.kotlin.test.backend.ir.IrBackendInput
 import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
-import org.jetbrains.kotlin.test.bind
-import org.jetbrains.kotlin.test.builders.*
+import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.builders.configureClassicFrontendHandlersStep
+import org.jetbrains.kotlin.test.builders.configureFirHandlersStep
+import org.jetbrains.kotlin.test.builders.configureIrHandlersStep
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.REQUIRES_SEPARATE_PROCESS
 import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
@@ -71,7 +76,7 @@ abstract class AbstractParcelizeBoxTestBase<R : ResultingArtifact.FrontendOutput

        useCustomRuntimeClasspathProviders(::ParcelizeRuntimeClasspathProvider)

-        useConfigurators(::ParcelizeEnvironmentConfigurator.bind(targetFrontend == FrontendKinds.FIR))
+        useConfigurators(::ParcelizeEnvironmentConfigurator)

        useAdditionalSourceProviders(::ParcelizeUtilSourcesProvider)

@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.parcelize.test.runners

 import org.jetbrains.kotlin.parcelize.test.services.ParcelizeEnvironmentConfigurator
-import org.jetbrains.kotlin.test.bind
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.AsmLikeInstructionListingDirectives.IR_DIFFERENCE
 import org.jetbrains.kotlin.test.runners.codegen.AbstractAsmLikeInstructionListingTest
@@ -30,5 +29,5 @@ private fun TestConfigurationBuilder.configureParcelizeSpecific() {
    defaultDirectives {
        +IR_DIFFERENCE
    }
-    useConfigurators(::ParcelizeEnvironmentConfigurator.bind(false))
+    useConfigurators(::ParcelizeEnvironmentConfigurator)
 }
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.parcelize.test.runners

 import org.jetbrains.kotlin.parcelize.test.services.ParcelizeEnvironmentConfigurator
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
-import org.jetbrains.kotlin.test.bind
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.builders.classicFrontendHandlersStep
 import org.jetbrains.kotlin.test.builders.classicFrontendStep
@@ -41,7 +40,7 @@ abstract class AbstractParcelizeDiagnosticTest : AbstractKotlinCompilerTest() {
        useConfigurators(
            ::CommonEnvironmentConfigurator,
            ::JvmEnvironmentConfigurator,
-            ::ParcelizeEnvironmentConfigurator.bind(false)
+            ::ParcelizeEnvironmentConfigurator
        )

        classicFrontendStep()
@@ -5,14 +5,10 @@

 package org.jetbrains.kotlin.parcelize.test.services

-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
+import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
 import org.jetbrains.kotlin.config.CompilerConfiguration
-import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
 import org.jetbrains.kotlin.parcelize.ParcelizeComponentRegistrar
-import org.jetbrains.kotlin.parcelize.ParcelizeFirIrGeneratorExtension
-import org.jetbrains.kotlin.parcelize.fir.FirParcelizeExtensionRegistrar
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.TestServices
@@ -20,10 +16,7 @@ import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File

-class ParcelizeEnvironmentConfigurator(
-    testServices: TestServices,
-    private val useFirExtension: Boolean
-) : EnvironmentConfigurator(testServices) {
+class ParcelizeEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) {
    override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {
        val runtimeLibrary = File(PathUtil.kotlinPathsForCompiler.libPath, PathUtil.PARCELIZE_RUNTIME_PLUGIN_JAR_NAME)
        val androidExtensionsRuntimeLibrary = File(PathUtil.kotlinPathsForCompiler.libPath, PathUtil.ANDROID_EXTENSIONS_RUNTIME_PLUGIN_JAR_NAME)
@@ -31,12 +24,10 @@ class ParcelizeEnvironmentConfigurator(
        configuration.addJvmClasspathRoots(listOf(runtimeLibrary, androidExtensionsRuntimeLibrary, androidApiJar))
    }

-    override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) {
-        if (useFirExtension) {
-            FirExtensionRegistrar.registerExtension(project, FirParcelizeExtensionRegistrar())
-            IrGenerationExtension.registerExtension(project, ParcelizeFirIrGeneratorExtension())
-        } else {
-            ParcelizeComponentRegistrar.registerParcelizeComponents(project)
-        }
+    override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions(
+        module: TestModule,
+        configuration: CompilerConfiguration
+    ) {
+        ParcelizeComponentRegistrar.registerParcelizeComponents(this)
    }
 }
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.TestServices

 class SerializableLikeExtensionProvider(testServices: TestServices) : EnvironmentConfigurator(testServices) {
-    override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) {
+    override fun legacyRegisterCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) {
        SyntheticResolveExtension.registerExtension(project, SerializableLike())
    }