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

[Plugins] Introduce new API for registering compiler plugins

Browse Source 
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
This commit is contained in:
Dmitriy Novozhilov
2022-06-07 10:23:09 +03:00
committed by teamcity
parent bb996c1b27
commit 8b42638afa
56 changed files with 392 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/lombok/lombok.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar → plugins/lombok/lombok.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
View File
plugins/lombok/lombok.cli/src/org/jetbrains/kotlin/lombok/LombokPlugin.kt
+11 -11
View File
@@ -5,17 +5,15 @@
package org.jetbrains.kotlin.lombok
import com.intellij.mock.MockProject
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
import org.jetbrains.kotlin.compiler.plugin.CliOption
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.CompilerConfigurationKey
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
import org.jetbrains.kotlin.lombok.LombokConfigurationKeys.CONFIG_FILE
import org.jetbrains.kotlin.lombok.LombokPluginNames.CONFIG_OPTION_NAME
import org.jetbrains.kotlin.lombok.LombokPluginNames.PLUGIN_ID
@@ -23,26 +21,28 @@ import org.jetbrains.kotlin.lombok.k2.FirLombokRegistrar
import org.jetbrains.kotlin.resolve.jvm.extensions.SyntheticJavaResolveExtension
import java.io.File
class LombokComponentRegistrar : ComponentRegistrar {
class LombokComponentRegistrar : CompilerPluginRegistrar() {
companion object {
fun registerComponents(project: Project, compilerConfiguration: CompilerConfiguration) {
fun registerComponents(extensionStorage: ExtensionStorage, compilerConfiguration: CompilerConfiguration) = with(extensionStorage) {
val configFile = compilerConfiguration[CONFIG_FILE]
val config = LombokPluginConfig(configFile)
SyntheticJavaResolveExtension.registerExtension(project, LombokResolveExtension(config))
FirExtensionRegistrar.registerExtension(project, FirLombokRegistrar(configFile))
SyntheticJavaResolveExtension.registerExtension(LombokResolveExtension(config))
FirExtensionRegistrarAdapter.registerExtension(FirLombokRegistrar(configFile))
}
}
override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
?.report(
CompilerMessageSeverity.WARNING,
"Lombok Kotlin compiler plugin is an experimental feature." +
" See: https://kotlinlang.org/docs/components-stability.html."
)
registerComponents(project, configuration)
registerComponents(this, configuration)
}
override val supportsK2: Boolean
get() = true
}
object LombokConfigurationKeys {
plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokTests.kt
+7 -4
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.lombok
import com.intellij.openapi.project.Project
import lombok.Getter
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar.ExtensionStorage
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
@@ -19,7 +19,10 @@ import org.jetbrains.kotlin.test.runners.codegen.AbstractBlackBoxCodegenTest
import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTest
import org.jetbrains.kotlin.test.runners.codegen.AbstractIrBlackBoxCodegenTest
import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlongside
import org.jetbrains.kotlin.test.services.*
import org.jetbrains.kotlin.test.services.AdditionalSourceProvider
import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.sourceFileProvider
import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
@@ -99,7 +102,7 @@ class LombokEnvironmentConfigurator(testServices: TestServices) : EnvironmentCon
}
}
override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) {
LombokComponentRegistrar.registerComponents(project, configuration)
override fun ExtensionStorage.registerCompilerExtensions(module: TestModule, configuration: CompilerConfiguration) {
LombokComponentRegistrar.registerComponents(this, configuration)
}
}