azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Use when instead of pipeline of changes

Browse Source 
#KT-37207 fixed
This commit is contained in:
Ilya Goncharov
2020-03-26 11:13:16 +03:00
parent 14af869a87
commit 201d140912
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnEntryRegistry.kt
+12 -13
View File
@@ -38,21 +38,20 @@ internal class YarnEntryRegistry(private val lockFile: File) {
private fun dependencyKey(packageKey: String, version: String) = private fun dependencyKey(packageKey: String, version: String) =
YarnLock.dependencyKey(packageKey, version).correctDependencyKey() YarnLock.dependencyKey(packageKey, version).correctDependencyKey()
private fun String.correctDependencyKey(): String { private fun String.correctDependencyKey(): String =
var correctedKey = replace(GITHUB_VERSION_PREFIX, "@") when {
contains(GITHUB_VERSION_PREFIX) -> replace(GITHUB_VERSION_PREFIX, "@")
contains(FILE_VERSION_PREFIX) -> {
val location = substringAfter(FILE_VERSION_PREFIX)
val path = lockFile
.parentFile
.resolve(location)
.canonicalPath
if (FILE_VERSION_PREFIX in correctedKey) { replaceAfter(FILE_VERSION_PREFIX, path)
val location = correctedKey.substringAfter(FILE_VERSION_PREFIX) }
val path = lockFile else -> this
.parentFile
.resolve(location)
.canonicalPath
correctedKey = correctedKey.replaceAfter(FILE_VERSION_PREFIX, path)
} }
return correctedKey
}
} }
private const val FILE_VERSION_PREFIX = "@file:" private const val FILE_VERSION_PREFIX = "@file:"