From 43ab4ad8e8bb6a06e97371c37184a9667d5da39f Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Mon, 20 Jan 2020 17:59:28 +0300
Subject: [PATCH] [Gradle, JS] Configure ir target in legacy plugin

---
 .../gradle/targets/js/KotlinJsTargetConfigurator.kt       | 2 --
 .../kotlin/gradle/targets/js/KotlinJsTargetPreset.kt      | 8 ++++++--
 .../gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt  | 5 +++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt
index 9478d7d1532..264827b6965 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt
@@ -59,7 +59,5 @@ open class KotlinJsTargetConfigurator(kotlinPluginVersion: String, val irConfigu
                 sourceMapEmbedSources = null
             }
         }
-
-        irConfigurator?.configureCompilations(target.irTarget!!)
     }
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt
index d7e4d466ed6..451b31e5576 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetPreset.kt
@@ -56,7 +56,10 @@ open class KotlinJsTargetPreset(
             }
         }
 
-        createKotlinTargetConfigurator().configureTarget(result)
+        createKotlinTargetConfigurator().apply {
+            irConfigurator?.configureTarget(result.irTarget!!, true)
+            configureTarget(result)
+        }
 
         return result
     }
@@ -89,7 +92,8 @@ class KotlinJsSingleTargetPreset(
 ) {
 
     // In a Kotlin/JS single-platform project, we don't need any disambiguation suffixes or prefixes in the names:
-    override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget<KotlinJsCompilation>): String? = null
+    override fun provideTargetDisambiguationClassifier(target: KotlinOnlyTarget<KotlinJsCompilation>): String? =
+        irPreset?.let { "legacy${target.name}" }
 
     override fun createKotlinTargetConfigurator() = KotlinJsTargetConfigurator(
         kotlinPluginVersion,
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt
index e9fc9d4205a..dd6845616b4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt
@@ -21,6 +21,11 @@ open class KotlinJsIrTargetConfigurator(kotlinPluginVersion: String) :
 
     override val testRunClass: Class<KotlinJsIrReportAggregatingTestRun> get() = KotlinJsIrReportAggregatingTestRun::class.java
 
+    @Deprecated("Remove when legacy js plugin will be removed")
+    fun configureTarget(target: KotlinJsIrTarget, mixedMode: Boolean) {
+        super<KotlinOnlyTargetConfigurator>.configureTarget(target) // TODO Add tests support
+    }
+
     override fun createTestRun(
         name: String,
         target: KotlinJsIrTarget