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

Fix script classpasth from environment extraction...

Browse Source 
for classes dirs
This commit is contained in:
Ilya Chernikov
2018-03-27 23:46:02 +02:00
parent 6ea41b425d
commit 15fcee474c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/context.kt
+8 -3
View File
@@ -58,6 +58,9 @@ fun File.matchMaybeVersionedFile(baseName: String) =
name == baseName.removeSuffix(".jar") || // for classes dirs name == baseName.removeSuffix(".jar") || // for classes dirs
Regex(Regex.escape(baseName.removeSuffix(".jar")) + "(-\\d.*)?\\.jar").matches(name) Regex(Regex.escape(baseName.removeSuffix(".jar")) + "(-\\d.*)?\\.jar").matches(name)
fun File.hasParentNamed(baseName: String): Boolean =
nameWithoutExtension == baseName || parentFile?.hasParentNamed(baseName) ?: false
private const val KOTLIN_COMPILER_EMBEDDABLE_JAR = "$KOTLIN_COMPILER_NAME-embeddable.jar" private const val KOTLIN_COMPILER_EMBEDDABLE_JAR = "$KOTLIN_COMPILER_NAME-embeddable.jar"
internal fun List<File>.takeIfContainsAll(vararg keyNames: String): List<File>? = internal fun List<File>.takeIfContainsAll(vararg keyNames: String): List<File>? =
@@ -67,10 +70,12 @@ internal fun List<File>.takeIfContainsAll(vararg keyNames: String): List<File>?
internal fun List<File>.filterIfContainsAll(vararg keyNames: String): List<File>? { internal fun List<File>.filterIfContainsAll(vararg keyNames: String): List<File>? {
val res = hashMapOf<String, File>() val res = hashMapOf<String, File>()
for (jar in this) { for (cpentry in this) {
for (prefix in keyNames) { for (prefix in keyNames) {
if (jar.matchMaybeVersionedFile(prefix)) { if (cpentry.matchMaybeVersionedFile(prefix) ||
res[prefix] = jar (cpentry.isDirectory && cpentry.hasParentNamed(prefix))
) {
res[prefix] = cpentry
break break
} }
} }