From 6931b37a7925dc0d52a2b2f406eb0f5e9095661b Mon Sep 17 00:00:00 2001 From: Victor Turansky Date: Mon, 23 Mar 2020 20:38:51 +0300 Subject: [PATCH] KT-34468 Yarn. Dependency search key calculated once --- .../org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt index c72b60685db..3688b115b60 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt @@ -117,8 +117,9 @@ abstract class YarnBasics : NpmApi { val deps = if (src.version != "*") { byKey[key] } else { + val searchKey = dependencyKey(src.key, "") byKey.entries - .firstOrNull { it.key.startsWith(dependencyKey(src.key, "")) } + .firstOrNull { it.key.startsWith(searchKey) } ?.value }