From 6b035bcdc283c435b27c1fd112f8c064c99de7e3 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 26 Mar 2020 20:41:53 +0300
Subject: [PATCH] [Gradle, JS] KT-37207 Move File prefix to NpmDependency.kt

---
 .../kotlin/gradle/targets/js/npm/NpmDependency.kt |  5 +++--
 .../gradle/targets/js/yarn/YarnEntryRegistry.kt   | 15 +++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt
index 2eae5abe1c2..3b18fe57fc4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt
@@ -17,7 +17,6 @@ import org.gradle.api.tasks.TaskDependency
 import org.gradle.internal.component.local.model.DefaultLibraryBinaryIdentifier
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinCompilationNpmResolution
-import org.jetbrains.kotlin.gradle.utils.relativeToRoot
 import java.io.File
 
 data class NpmDependency(
@@ -135,4 +134,6 @@ data class NpmDependency(
     }
 
     override fun getReason(): String? = reason
-}
\ No newline at end of file
+}
+
+const val FILE_VERSION_PREFIX = "file:"
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnEntryRegistry.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnEntryRegistry.kt
index c95a780224d..4f27b658563 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnEntryRegistry.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnEntryRegistry.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.gradle.targets.js.yarn
 
 import com.github.gundy.semver4j.SemVer
+import org.jetbrains.kotlin.gradle.targets.js.npm.FILE_VERSION_PREFIX
 import java.io.File
 
 internal class YarnEntryRegistry(private val lockFile: File) {
@@ -40,19 +41,21 @@ internal class YarnEntryRegistry(private val lockFile: File) {
 
     private fun String.correctDependencyKey(): String =
         when {
-            GITHUB_VERSION_PREFIX in this -> replace(GITHUB_VERSION_PREFIX, "@")
-            FILE_VERSION_PREFIX in this -> {
-                val location = substringAfter(FILE_VERSION_PREFIX)
+            GITHUB_MARKER in this -> replace(GITHUB_MARKER, SEPARATOR)
+            FILE_MARKER in this -> {
+                val location = substringAfter(FILE_MARKER)
                 val path = lockFile
                     .parentFile
                     .resolve(location)
                     .canonicalPath
 
-                replaceAfter(FILE_VERSION_PREFIX, path)
+                replaceAfter(FILE_MARKER, path)
             }
             else -> this
         }
 }
 
-private const val FILE_VERSION_PREFIX = "@file:"
-private const val GITHUB_VERSION_PREFIX = "@github:"
\ No newline at end of file
+private const val SEPARATOR = "@"
+
+private const val FILE_MARKER = "${SEPARATOR}$FILE_VERSION_PREFIX"
+private const val GITHUB_MARKER = "${SEPARATOR}github:"
\ No newline at end of file