diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt index cacb9169004..273beaf4b26 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.test.services -import com.intellij.mock.MockProject import org.jetbrains.kotlin.config.AnalysisFlag import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfigurationKey @@ -22,20 +21,19 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices) protected val moduleStructure: TestModuleStructure get() = testServices.moduleStructure - protected open fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {} + protected open fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {} fun configureCompileConfigurationWithAdditionalConfigurationKeys( configuration: CompilerConfiguration, module: TestModule, - project: MockProject ) { - configureCompilerConfiguration(configuration, module, project) + configureCompilerConfiguration(configuration, module) val extractor = DirectiveToConfigurationKeyExtractor() extractor.provideConfigurationKeys() extractor.configure(configuration, module.directives) } - protected open fun DirectiveToConfigurationKeyExtractor.provideConfigurationKeys() {} + open fun DirectiveToConfigurationKeyExtractor.provideConfigurationKeys() {} open fun provideAdditionalAnalysisFlags(directives: RegisteredDirectives): Map, Any?> { return emptyMap() 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 48fcd38274a..27d406b6996 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 @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.test.services -import com.intellij.mock.MockProject import com.intellij.openapi.Disposable import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope @@ -90,7 +89,7 @@ open class CompilerConfigurationProviderImpl( ) } - private fun createCompilerConfiguration(module: TestModule, project: MockProject): CompilerConfiguration { + fun createCompilerConfiguration(module: TestModule): CompilerConfiguration { val configuration = CompilerConfiguration() configuration[CommonConfigurationKeys.MODULE_NAME] = module.name @@ -108,7 +107,7 @@ open class CompilerConfigurationProviderImpl( } configuration.languageVersionSettings = module.languageVersionSettings - configurators.forEach { it.configureCompileConfigurationWithAdditionalConfigurationKeys(configuration, module, project) } + configurators.forEach { it.configureCompileConfigurationWithAdditionalConfigurationKeys(configuration, module) } return configuration } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt index 5799d2fcffe..1d9d69563e5 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.test.services.configuration -import com.intellij.mock.MockProject import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfigurationKey import org.jetbrains.kotlin.test.directives.ConfigurationDirectives @@ -19,7 +18,7 @@ class CommonEnvironmentConfigurator(testServices: TestServices) : EnvironmentCon override val directivesContainers: List get() = listOf(ConfigurationDirectives) - override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) { + override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { val rawFlags = module.directives[ConfigurationDirectives.KOTLIN_CONFIGURATION_FLAGS] parseAnalysisFlags(rawFlags).forEach { (key, value) -> @Suppress("UNCHECKED_CAST") diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt index b7f0929e65f..2c7c1e7355a 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.test.services.configuration -import com.intellij.mock.MockProject import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.js.config.JSConfigurationKeys import org.jetbrains.kotlin.js.config.JsConfig @@ -21,7 +20,7 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu override val directivesContainers: List get() = listOf(JsEnvironmentConfigurationDirectives) - override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) { + override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { val moduleKinds = module.directives[JsEnvironmentConfigurationDirectives.MODULE_KIND] val moduleKind = when (moduleKinds.size) { 0 -> ModuleKind.PLAIN diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt index 1ee91629bec..cc39ab1dbc5 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.test.services.configuration -import com.intellij.mock.MockProject import com.intellij.openapi.util.SystemInfo import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoot import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot @@ -62,7 +61,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig register(USE_OLD_INLINE_CLASSES_MANGLING_SCHEME, JVMConfigurationKeys.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME) } - override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) { + override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { if (module.targetPlatform !in JvmPlatforms.allJvmPlatforms) return val registeredDirectives = module.directives val targets = registeredDirectives[JvmEnvironmentConfigurationDirectives.JVM_TARGET] diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt index e6b7ddd7ca6..6fa455331ff 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt @@ -5,8 +5,6 @@ package org.jetbrains.kotlin.test.services.configuration -import com.intellij.mock.MockProject -import org.jetbrains.kotlin.cli.jvm.config.JvmContentRoot import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots import org.jetbrains.kotlin.codegen.CodegenTestUtil import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime @@ -24,7 +22,6 @@ import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.* -import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.JavaTypeEnhancementState import org.jetbrains.kotlin.utils.ReportLevel import java.io.File @@ -48,7 +45,7 @@ open class JvmForeignAnnotationsConfigurator(testServices: TestServices) : Envir get() = listOf(ForeignAnnotationsDirectives) @OptIn(ExperimentalStdlibApi::class) - override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) { + override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { val extraClassPath = buildList { val foreignAnnotations = createJarWithForeignAnnotations(module) addAll(foreignAnnotations) @@ -102,7 +99,7 @@ open class JvmForeignAnnotationsConfigurator(testServices: TestServices) : Envir class JvmForeignAnnotationsAgainstCompiledJavaConfigurator(testServices: TestServices) : JvmForeignAnnotationsConfigurator(testServices) { @OptIn(ExperimentalStdlibApi::class) - override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) { + override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { val compiledJavaPath = testServices.createTempDirectory("java-compiled-files") val foreignAnnotations = createJarWithForeignAnnotations(module) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/ScriptingEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/ScriptingEnvironmentConfigurator.kt index 89aa9fee42f..eca34894dfe 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/ScriptingEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/ScriptingEnvironmentConfigurator.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.test.services.configuration -import com.intellij.mock.MockProject import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.script.loadScriptingPlugin import org.jetbrains.kotlin.test.model.TestModule @@ -14,7 +13,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.isKtsFile class ScriptingEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { - override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) { + override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { if (module.files.any { it.isKtsFile }) { loadScriptingPlugin(configuration) }