diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/compilerPluginConfiguration.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/compilerPluginConfiguration.kt index bfafbc72305..635ef8e2e5a 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/compilerPluginConfiguration.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/compilerPluginConfiguration.kt @@ -58,9 +58,9 @@ private class EnabledByDirectiveConfiguratorDecorator( languageVersion: LanguageVersion ): Map, Any?> = original.provideAdditionalAnalysisFlags(directives, languageVersion) - override fun registerCompilerExtensions(project: Project, module: TestModule) { + override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) { if (directive !in module.directives) return - original.registerCompilerExtensions(project, module) + original.registerCompilerExtensions(project, module, configuration) } -} \ No newline at end of file +} diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/AbstractEnvironmentConfigurator.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/AbstractEnvironmentConfigurator.kt index 0b2df683380..335aec5ac65 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/AbstractEnvironmentConfigurator.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/AbstractEnvironmentConfigurator.kt @@ -22,7 +22,7 @@ abstract class AbstractEnvironmentConfigurator : ServicesAndDirectivesContainer abstract fun provideAdditionalAnalysisFlags(directives: RegisteredDirectives, languageVersion: LanguageVersion): Map, Any?> - abstract fun registerCompilerExtensions(project: Project, module: TestModule) + abstract fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) } abstract class EnvironmentConfigurator(protected val testServices: TestServices) : AbstractEnvironmentConfigurator() { @@ -50,7 +50,7 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices) return emptyMap() } - override fun registerCompilerExtensions(project: Project, module: TestModule) {} + override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) {} } class DirectiveToConfigurationKeyExtractor { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/CompilerConfigurationProvider.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/CompilerConfigurationProvider.kt index eba169f450e..60101a42701 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/CompilerConfigurationProvider.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/CompilerConfigurationProvider.kt @@ -91,14 +91,14 @@ open class CompilerConfigurationProviderImpl( testServices.applicationDisposableProvider.getApplicationRootDisposable(), CompilerConfiguration() ) - val initialConfiguration = createCompilerConfiguration(module) - val projectEnv = KotlinCoreEnvironment.ProjectEnvironment(testRootDisposable, applicationEnvironment, initialConfiguration) + val configuration = createCompilerConfiguration(module) + val projectEnv = KotlinCoreEnvironment.ProjectEnvironment(testRootDisposable, applicationEnvironment, configuration) val project = projectEnv.project return KotlinCoreEnvironment.createForTests( projectEnv, - initialConfiguration, + configuration, configFiles - ).also { configurators.forEach { it.registerCompilerExtensions(project, module) } } + ).also { configurators.forEach { it.registerCompilerExtensions(project, module, configuration) } } } @TestInfrastructureInternals diff --git a/plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlinx/atomicfu/AbstractAtomicfuJsIrTest.kt b/plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlinx/atomicfu/AbstractAtomicfuJsIrTest.kt index e25162b7b84..616589be64b 100644 --- a/plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlinx/atomicfu/AbstractAtomicfuJsIrTest.kt +++ b/plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlinx/atomicfu/AbstractAtomicfuJsIrTest.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlinx.atomicfu import com.intellij.openapi.project.Project import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension +import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.js.test.ir.AbstractJsIrTest import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.model.TestModule @@ -39,7 +40,7 @@ class AtomicfuRuntimeClasspathProvider(testServices: TestServices) : RuntimeClas } class AtomicfuEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { - override fun registerCompilerExtensions(project: Project, module: TestModule) { + override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) { IrGenerationExtension.registerExtension(project, AtomicfuLoweringExtension()) } -} \ No newline at end of file +} diff --git a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/services/ExtensionRegistrarConfigurator.kt b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/services/ExtensionRegistrarConfigurator.kt index 5d259607c31..a45a90d48fa 100644 --- a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/services/ExtensionRegistrarConfigurator.kt +++ b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/services/ExtensionRegistrarConfigurator.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.plugin.services import com.intellij.openapi.project.Project import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension +import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar import org.jetbrains.kotlin.fir.plugin.FirPluginPrototypeExtensionRegistrar import org.jetbrains.kotlin.ir.plugin.GeneratedDeclarationsIrBodyFiller @@ -15,7 +16,7 @@ import org.jetbrains.kotlin.test.services.EnvironmentConfigurator import org.jetbrains.kotlin.test.services.TestServices class ExtensionRegistrarConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { - override fun registerCompilerExtensions(project: Project, module: TestModule) { + override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) { FirExtensionRegistrar.registerExtension(project, FirPluginPrototypeExtensionRegistrar()) IrGenerationExtension.registerExtension(project, GeneratedDeclarationsIrBodyFiller()) } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/RuntimeSearch.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/RuntimeSearch.kt index 06a1d044847..c3998665a8a 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/RuntimeSearch.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/RuntimeSearch.kt @@ -58,7 +58,7 @@ internal fun TestConfigurationBuilder.configureForKotlinxSerialization(libraries configuration.addJvmClasspathRoots(librariesPaths) } - override fun registerCompilerExtensions(project: Project, module: TestModule) { + override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) { SerializationComponentRegistrar.registerExtensions(project) } } diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/ParcelizeEnvironmentConfigurator.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/ParcelizeEnvironmentConfigurator.kt index 513031e87a6..2da63d06ef3 100644 --- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/ParcelizeEnvironmentConfigurator.kt +++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/ParcelizeEnvironmentConfigurator.kt @@ -31,7 +31,7 @@ class ParcelizeEnvironmentConfigurator( configuration.addJvmClasspathRoots(listOf(runtimeLibrary, androidExtensionsRuntimeLibrary, androidApiJar)) } - override fun registerCompilerExtensions(project: Project, module: TestModule) { + override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) { if (useFirExtension) { FirExtensionRegistrar.registerExtension(project, FirParcelizeExtensionRegistrar()) IrGenerationExtension.registerExtension(project, ParcelizeFirIrGeneratorExtension()) diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/SerializableLikeExtensionProvider.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/SerializableLikeExtensionProvider.kt index 29bf95f08cf..52f1309a0b7 100644 --- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/SerializableLikeExtensionProvider.kt +++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/services/SerializableLikeExtensionProvider.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.parcelize.test.services import com.intellij.openapi.project.Project +import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.name.FqName @@ -16,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) { + override fun registerCompilerExtensions(project: Project, module: TestModule, configuration: CompilerConfiguration) { SyntheticResolveExtension.registerExtension(project, SerializableLike()) }