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

Fix script classpath utility functions that use classpath filtering by "keys"

Browse Source 
The problem was that only the first matching classpath entry were used.
The problem was reported by @lion7 on github (https://github.com/JetBrains/kotlin/commit/67ad3773de2b12f7e1d29e00151b997a4f6373ba#commitcomment-34443927)
This commit is contained in:
Ilya Chernikov
2019-07-25 17:33:28 +02:00
parent ec3ccf1ba8
commit a858607fac
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt
+6 -7
View File
@@ -228,19 +228,18 @@ internal fun List<File>.takeIfContainsAll(vararg keyNames: String): List<File>?
}
internal fun List<File>.filterIfContainsAll(vararg keyNames: String): List<File>? {
val res = hashMapOf<String, File>()
val foundKeys = mutableSetOf<String>()
val res = arrayListOf<File>()
for (cpentry in this) {
for (prefix in keyNames) {
if (!res.containsKey(prefix) &&
(cpentry.matchMaybeVersionedFile(prefix) || (cpentry.isDirectory && cpentry.hasParentNamed(prefix)))
) {
res[prefix] = cpentry
if (cpentry.matchMaybeVersionedFile(prefix) || (cpentry.isDirectory && cpentry.hasParentNamed(prefix))) {
foundKeys.add(prefix)
res.add(cpentry)
break
}
}
}
return if (keyNames.all { res.containsKey(it) }) res.values.toList()
else null
return res.takeIf { foundKeys.containsAll(keyNames.asList()) }
}
internal fun List<File>.takeIfContainsAny(vararg keyNames: String): List<File>? =