From a874f4f5c38c6f6bfe5b87b24883485faadd3914 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Tue, 6 Aug 2019 15:43:57 +0300
Subject: [PATCH] Don't use `addIfNotNull` core util in the JS Gradle plugin

The function was placed in a package whose another top-level function
used coroutines. This led to a NCDFE kotlin.coroutines.Continuation
with Gradle versions that bundle Kotlin pre-1.3 stdlib.

Instead, use the existing util function `lowerCamelCaseName` which also
filters nulls.
---
 .../targets/js/subtargets/KotlinJsSubTarget.kt | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
index c0b64a6135a..7c11b1dd560 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 import org.jetbrains.kotlin.gradle.tasks.createOrRegisterTask
 import org.jetbrains.kotlin.gradle.testing.internal.configureConventions
 import org.jetbrains.kotlin.gradle.testing.internal.kotlinTestRegistry
-import org.jetbrains.kotlin.utils.addIfNotNull
+import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
 
 abstract class KotlinJsSubTarget(
     val target: KotlinJsTarget,
@@ -43,20 +43,8 @@ abstract class KotlinJsSubTarget(
         }
     }
 
-    private fun disambiguate(name: String): MutableList<String> {
-        val components = mutableListOf<String>()
-
-        components.addIfNotNull(target.disambiguationClassifier)
-        components.add(disambiguationClassifier)
-        components.add(name)
-        return components
-    }
-
-    protected fun disambiguateCamelCased(name: String): String {
-        val components = disambiguate(name)
-
-        return components.first() + components.drop(1).joinToString("") { it.capitalize() }
-    }
+    protected fun disambiguateCamelCased(name: String): String =
+        lowerCamelCaseName(target.disambiguationClassifier, disambiguationClassifier, name)
 
     private fun configureTests() {
         target.compilations.all { compilation ->