Introduce configureEnvironment, avoid 'createEnvironment' calls

compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt

@@ -91,7 +91,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
         files: List<TestFile>
     ) {
         environment = createEnvironment(wholeFile)
-
+        setupEnvironment(environment)
         analyzeAndCheck(wholeFile, files)
     }
 

compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java

@@ -93,6 +93,10 @@ public abstract class KotlinMultiFileTestWithJava<M extends KotlinBaseTest.TestM
 
     }
 
+    protected void setupEnvironment(@NotNull KotlinCoreEnvironment environment) {
+
+    }
+
     @NotNull
     protected ConfigurationKind getConfigurationKind() {
         return ConfigurationKind.JDK_ONLY;

compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt

@@ -54,12 +54,10 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() {
         }
     }
 
-    override fun createEnvironment(file: File): KotlinCoreEnvironment {
+    override fun setupEnvironment(environment: KotlinCoreEnvironment) {
-        return super.createEnvironment(file).apply {
+        Extensions.getArea(environment.project)
-            Extensions.getArea(this.project)
+            .getExtensionPoint(PsiElementFinder.EP_NAME)
-                .getExtensionPoint(PsiElementFinder.EP_NAME)
+            .unregisterExtension(JavaElementFinder::class.java)
-                .unregisterExtension(JavaElementFinder::class.java)
-        }
     }
 
     open fun analyzeAndCheckUnhandled(testDataFile: File, files: List<TestFile>, useLightTree: Boolean = false) {

plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/AbstractSerializationPluginDiagnosticTest.kt

@@ -6,15 +6,15 @@
 package org.jetbrains.kotlinx.serialization
 
 import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTest
+import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
 import org.jetbrains.kotlinx.serialization.compiler.extensions.SerializationComponentRegistrar
-import java.io.File
 
 abstract class AbstractSerializationPluginDiagnosticTest : AbstractDiagnosticsTest() {
     private val runtimeLibraryPath = getSerializationLibraryRuntimeJar()
 
-    override fun createEnvironment(file: File) = super.createEnvironment(file).apply {
+    override fun setupEnvironment(environment: KotlinCoreEnvironment) {
-        SerializationComponentRegistrar.registerExtensions(this.project)
+        SerializationComponentRegistrar.registerExtensions(environment.project)
-        updateClasspath(listOf(JvmClasspathRoot(runtimeLibraryPath!!)))
+        environment.updateClasspath(listOf(JvmClasspathRoot(runtimeLibraryPath!!)))
     }
 }

plugins/sam-with-receiver/sam-with-receiver-cli/test/org/jetbrains/kotlin/samWithReceiver/AbstractSamWithReceiverScriptTest.kt

@@ -17,27 +17,24 @@
 package org.jetbrains.kotlin.samWithReceiver
 
 import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTest
+import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
 import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
 import org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate
-import java.io.File
 import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
 import kotlin.script.extensions.SamWithReceiverAnnotations
 import kotlin.script.templates.ScriptTemplateDefinition
 
 abstract class AbstractSamWithReceiverScriptTest : AbstractDiagnosticsTest() {
-    private companion object {
-        private val TEST_ANNOTATIONS = emptyList<String>()
-    }
 
-    override fun createEnvironment(file: File) = super.createEnvironment(file).apply {
+    override fun setupEnvironment(environment: KotlinCoreEnvironment) {
-        StorageComponentContainerContributor.registerExtension(project, CliSamWithReceiverComponentContributor(TEST_ANNOTATIONS))
+        StorageComponentContainerContributor.registerExtension(environment.project, CliSamWithReceiverComponentContributor(emptyList()))
         val def = ScriptDefinition.FromLegacy(
             defaultJvmScriptingHostConfiguration,
             KotlinScriptDefinitionFromAnnotatedTemplate(ScriptForSamWithReceivers::class, emptyMap())
         )
-        configuration.add(ScriptingConfigurationKeys.SCRIPT_DEFINITIONS, def)
+        environment.configuration.add(ScriptingConfigurationKeys.SCRIPT_DEFINITIONS, def)
     }
 }
 

plugins/sam-with-receiver/sam-with-receiver-cli/test/org/jetbrains/kotlin/samWithReceiver/AbstractSamWithReceiverTest.kt

@@ -17,15 +17,18 @@
 package org.jetbrains.kotlin.samWithReceiver
 
 import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTest
+import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
-import java.io.File
 
 abstract class AbstractSamWithReceiverTest : AbstractDiagnosticsTest() {
     private companion object {
         private val TEST_ANNOTATIONS = listOf("SamWithReceiver")
     }
 
-    override fun createEnvironment(file: File) = super.createEnvironment(file).apply {
+    override fun setupEnvironment(environment: KotlinCoreEnvironment) {
-        StorageComponentContainerContributor.registerExtension(project, CliSamWithReceiverComponentContributor(TEST_ANNOTATIONS))
+        StorageComponentContainerContributor.registerExtension(
+            environment.project,
+            CliSamWithReceiverComponentContributor(TEST_ANNOTATIONS)
+        )
     }
 }