From 8dad2d30f5e5f7dc8027e13b5ee2c018dd9ee362 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 14 Feb 2018 23:55:16 +0300
Subject: [PATCH] Move the compiler.xml back to IDEA (this fixes almost all IDE
 tests when running on JPS)

---
 compiler/build.gradle.kts                                    | 5 +++++
 .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt         | 2 +-
 idea/build.gradle.kts                                        | 5 -----
 {compiler/cli => idea}/src/META-INF/extensions/compiler.xml  | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename {compiler/cli => idea}/src/META-INF/extensions/compiler.xml (100%)

diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 904353249f4..ff7d7c2fc2e 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -94,6 +94,11 @@ sourceSets {
     }
 }
 
+val jar: Jar by tasks
+jar.from("../idea/src") {
+    include("META-INF/extensions/compiler.xml")
+}
+
 projectTest {
     dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
     workingDir = rootDir
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index 39cc92c47d1..7fdb0ba2287 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -526,7 +526,7 @@ class KotlinCoreEnvironment private constructor(
                     ?: configuration.get(CLIConfigurationKeys.COMPILER_JAR_LOCATOR)?.compilerJar
                     ?: PathUtil.getResourcePathForClass(this::class.java).takeIf { it.hasConfigFile(configFilePath) }
                     // hack for load extensions when compiler run directly from project directory (e.g. in tests)
-                    ?: File("compiler/cli/src").takeIf { it.hasConfigFile(configFilePath) }
+                    ?: File("idea/src").takeIf { it.hasConfigFile(configFilePath) }
                     ?: throw IllegalStateException(
                                 "Unable to find extension point configuration $configFilePath " +
                                 "(cp:\n  ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n  ") { it.file }})")
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index d6bfda79fa0..ba0fc4e2776 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -97,11 +97,6 @@ dependencies {
     testRuntime(intellijPluginDep("testng"))
 }
 
-val processResources: Copy by tasks
-processResources.from("../compiler/cli/src") {
-    include("META-INF/extensions/compiler.xml")
-}
-
 sourceSets {
     "main" {
         projectDefault()
diff --git a/compiler/cli/src/META-INF/extensions/compiler.xml b/idea/src/META-INF/extensions/compiler.xml
similarity index 100%
rename from compiler/cli/src/META-INF/extensions/compiler.xml
rename to idea/src/META-INF/extensions/compiler.xml