From b68715441f78917057697674e053ea56487ded10 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 2 Jun 2020 11:46:08 +0300 Subject: [PATCH] [Gradle, JS] Remove redundant fixing names - in case when target name is `jsLegacy` with enabled both mode, we should get `jsLegacyMain` and `jsLegacyTest`, and Gradle plugin creates targets `jsLegacyLegacy` and `jsLegacyIr`, schema is name+suffix where name can be any, KotlinJsTargetPreset's name is name+`Both` so in KotlinJsTargetPreset in `both` case we need remove only `Both` suffix #KT-39213 Fixed --- .../kotlin/gradle/targets/js/KotlinJsTargetPreset.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 3ed200c184f..5330e44ca31 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 @@ -31,13 +31,11 @@ open class KotlinJsTargetPreset( override val platformType: KotlinPlatformType get() = KotlinPlatformType.js - override fun useDisambiguitionClassifierAsSourcesetNamePreffix() = false + override fun useDisambiguitionClassifierAsSourcesetNamePreffix() = irPreset == null override fun overrideDisambiguitionClassifierOnIdeImport(): String? = if (isMpp) { irPreset?.let { - name.removeJsCompilerSuffix(KotlinJsCompilerType.LEGACY) - .removeJsCompilerSuffix(KotlinJsCompilerType.IR) - .removeJsCompilerSuffix(KotlinJsCompilerType.BOTH) + name.removeJsCompilerSuffix(KotlinJsCompilerType.BOTH) } } else { null