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

[minor] fix findCompiler logic in runner for debuggung

Browse Source
This commit is contained in:
Ilya Chernikov
2020-03-30 18:37:47 +02:00
parent 6a24268db1
commit 15d76ae887
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt
+2 -1
View File
@@ -9,7 +9,8 @@ import java.io.File
import java.net.URL import java.net.URL
fun findCompilerJar(classFromJarInTheSameLocation: Class<*>, kotlinHome: File): List<File> { fun findCompilerJar(classFromJarInTheSameLocation: Class<*>, kotlinHome: File): List<File> {
val baseDir = (tryGetResourcePathForClass(classFromJarInTheSameLocation)?.parentFile ?: kotlinHome).takeIf { it.isDirectory } val baseDir = (tryGetResourcePathForClass(classFromJarInTheSameLocation)?.takeUnless { it.isDirectory }?.parentFile
?: kotlinHome).takeIf { it.isDirectory }
?: return emptyList() ?: return emptyList()
val compilerJars = baseDir.listFiles { f: File -> val compilerJars = baseDir.listFiles { f: File ->
COMPILER_JARS.any { expected -> COMPILER_JARS.any { expected ->