From 2d67e67cd8e2b4f2c5e611b60965c6b084e5db3c Mon Sep 17 00:00:00 2001 From: Youssef Shoaib Date: Wed, 22 Oct 2025 14:48:53 +0100 Subject: [PATCH 1/2] Deduplicate extension config from ExtensionRegistrarConfigurator --- .../services/ExtensionRegistrarConfigurator.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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..cba595c 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) { - override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions( + private val registrar = SimplePluginComponentRegistrar() + override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions( module: TestModule, configuration: CompilerConfiguration - ) { - FirExtensionRegistrarAdapter.registerExtension(SimplePluginRegistrar()) - IrGenerationExtension.registerExtension(SimpleIrGenerationExtension()) - } + ) { + with(registrar) { registerExtensions(configuration) } + } } From e14f34d2313a2fa8dcda74db7de6741f663d8fe8 Mon Sep 17 00:00:00 2001 From: Youssef Shoaib Date: Tue, 13 Jan 2026 23:10:06 +0000 Subject: [PATCH 2/2] Reformat --- .../services/ExtensionRegistrarConfigurator.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 cba595c..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 @@ -14,11 +14,11 @@ fun TestConfigurationBuilder.configurePlugin() { } private class ExtensionRegistrarConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { - private val registrar = SimplePluginComponentRegistrar() - override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions( + private val registrar = SimplePluginComponentRegistrar() + override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions( module: TestModule, configuration: CompilerConfiguration - ) { - with(registrar) { registerExtensions(configuration) } - } + ) { + with(registrar) { registerExtensions(configuration) } + } }