From 34f8c7a68b520616be19690be91647b2158e3631 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 18 Mar 2021 13:56:03 +0300
Subject: [PATCH] [TEST] Add ability to register compiler extensions in
 EnvironmentConfigurator

---
 .../jetbrains/kotlin/test/services/EnvironmentConfigurator.kt  | 3 +++
 .../kotlin/test/services/CompilerConfigurationProvider.kt      | 2 ++
 2 files changed, 5 insertions(+)

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 cef605df6e1..40f4eb07b05 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,6 +5,7 @@
 
 package org.jetbrains.kotlin.test.services
 
+import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.config.AnalysisFlag
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.CompilerConfigurationKey
@@ -38,6 +39,8 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices)
     open fun provideAdditionalAnalysisFlags(directives: RegisteredDirectives): Map<AnalysisFlag<*>, Any?> {
         return emptyMap()
     }
+
+    open fun registerCompilerExtensions(project: Project) {}
 }
 
 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 89e790458bb..762ee4fe90c 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
@@ -84,6 +84,8 @@ open class CompilerConfigurationProviderImpl(
             CompilerConfiguration()
         )
         val projectEnv = KotlinCoreEnvironment.ProjectEnvironment(testRootDisposable, applicationEnvironment)
+        val project = projectEnv.project
+        configurators.forEach { it.registerCompilerExtensions(project) }
         return KotlinCoreEnvironment.createForTests(
             projectEnv,
             createCompilerConfiguration(module),