From 83e17cbf09241228a4fc101a85e4975cc8c99a94 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Tue, 2 Jun 2020 14:22:54 +0300
Subject: [PATCH] [Gradle, JS] Use name of target, not name of preset

---
 .../kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt       | 8 ++++----
 .../kotlin/gradle/targets/js/KotlinJsTargetPreset.kt      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt
index b04ecb60d53..3328ab51d91 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargetPresets.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -7,8 +7,8 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
 
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinOnlyTargetConfigurator
+import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinTargetPreset
 
 abstract class KotlinOnlyTargetPreset<R : KotlinOnlyTarget<T>, T : KotlinCompilation<*>>(
@@ -24,7 +24,7 @@ abstract class KotlinOnlyTargetPreset<R : KotlinOnlyTarget<T>, T : KotlinCompila
     // This function is used in IDE import in order to indicate that sourceSetName=disambiguitionClassifier+compilationName
     protected open fun useDisambiguitionClassifierAsSourcesetNamePreffix() = true
 
-    protected open fun overrideDisambiguitionClassifierOnIdeImport(): String? = null
+    protected open fun overrideDisambiguitionClassifierOnIdeImport(name: String): String? = null
 
     abstract protected fun instantiateTarget(name: String): R
 
@@ -33,7 +33,7 @@ abstract class KotlinOnlyTargetPreset<R : KotlinOnlyTarget<T>, T : KotlinCompila
             targetName = name
             disambiguationClassifier = provideTargetDisambiguationClassifier(this@apply)
             useDisambiguitionClassifierAsSourcesetNamePreffix = useDisambiguitionClassifierAsSourcesetNamePreffix()
-            overrideDisambiguitionClassifierOnIdeImport = overrideDisambiguitionClassifierOnIdeImport()
+            overrideDisambiguitionClassifierOnIdeImport = overrideDisambiguitionClassifierOnIdeImport(name)
             preset = this@KotlinOnlyTargetPreset
 
             val compilationFactory = createCompilationFactory(this)
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 5330e44ca31..e94de1145e4 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
@@ -33,9 +33,9 @@ open class KotlinJsTargetPreset(
 
     override fun useDisambiguitionClassifierAsSourcesetNamePreffix() = irPreset == null
 
-    override fun overrideDisambiguitionClassifierOnIdeImport(): String? = if (isMpp) {
+    override fun overrideDisambiguitionClassifierOnIdeImport(name: String): String? = if (isMpp) {
         irPreset?.let {
-            name.removeJsCompilerSuffix(KotlinJsCompilerType.BOTH)
+            name.removeJsCompilerSuffix(KotlinJsCompilerType.LEGACY)
         }
     } else {
         null