diff --git a/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/ExtensionRegistrarConfigurator.kt b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/ExtensionRegistrarConfigurator.kt index 0b9af52..6db94cc 100644 --- a/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/ExtensionRegistrarConfigurator.kt +++ b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/ExtensionRegistrarConfigurator.kt @@ -1,11 +1,8 @@ package org.jetbrains.kotlin.compiler.plugin.template.services -import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar -import org.jetbrains.kotlin.compiler.plugin.template.SimplePluginRegistrar -import org.jetbrains.kotlin.compiler.plugin.template.ir.SimpleIrGenerationExtension +import org.jetbrains.kotlin.compiler.plugin.template.SimplePluginComponentRegistrar import org.jetbrains.kotlin.config.CompilerConfiguration -import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.EnvironmentConfigurator @@ -17,11 +14,11 @@ fun TestConfigurationBuilder.configurePlugin() { } private class ExtensionRegistrarConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { + private val registrar = SimplePluginComponentRegistrar() override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions( module: TestModule, configuration: CompilerConfiguration ) { - FirExtensionRegistrarAdapter.registerExtension(SimplePluginRegistrar()) - IrGenerationExtension.registerExtension(SimpleIrGenerationExtension()) + with(registrar) { registerExtensions(configuration) } } }