From 625e94822f7508512f77379a058db071f27de9a3 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 13 Feb 2020 12:40:49 +0300
Subject: [PATCH] [Gradle, JS] Remove redundant baseName

---
 .../targets/js/ir/KotlinJsBinaryContainer.kt   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt
index 4c817ea9365..95307d368fd 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsBinaryContainer.kt
@@ -38,21 +38,30 @@ constructor(
     fun executable(
         compilation: KotlinJsCompilation = defaultCompilation
     ) = createBinaries(
-        baseName = project.name,
         compilation = compilation,
         jsBinaryType = JsBinaryType.EXECUTABLE,
         create = ::Executable
     )
 
     internal fun testExecutable() = createBinaries(
-        baseName = project.name,
         compilation = defaultTestCompilation,
         jsBinaryType = JsBinaryType.TEST,
         create = ::TestExecutable
     )
 
+    internal fun getBinary(
+        buildVariantKind: BuildVariantKind,
+        jsBinaryType: JsBinaryType
+    ): JsBinary =
+        nameToBinary.getValue(
+            generateBinaryName(
+                buildVariantKind,
+                jsBinaryType
+            )
+        )
+
+
     private fun <T : JsBinary> createBinaries(
-        baseName: String,
         compilation: KotlinJsCompilation,
         buildVariantKinds: Collection<BuildVariantKind> = listOf(PRODUCTION, DEVELOPMENT),
         jsBinaryType: JsBinaryType,
@@ -60,7 +69,6 @@ constructor(
     ) {
         buildVariantKinds.forEach { buildVariantKind ->
             val name = generateBinaryName(
-                baseName,
                 buildVariantKind,
                 jsBinaryType
             )
@@ -81,12 +89,10 @@ constructor(
 
     companion object {
         internal fun generateBinaryName(
-            name: String,
             buildVariantKind: BuildVariantKind,
             jsBinaryType: JsBinaryType
         ) =
             lowerCamelCaseName(
-                name,
                 buildVariantKind.name,
                 jsBinaryType.name
             )