From 15d76ae887c8db69c15dc8f673cbda71b8fb2273 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 30 Mar 2020 18:37:47 +0200 Subject: [PATCH] [minor] fix findCompiler logic in runner for debuggung --- .../cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt index 757bec84dfc..ed3c0f8da57 100644 --- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt +++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/findCompiler.kt @@ -9,7 +9,8 @@ import java.io.File import java.net.URL fun findCompilerJar(classFromJarInTheSameLocation: Class<*>, kotlinHome: File): List { - val baseDir = (tryGetResourcePathForClass(classFromJarInTheSameLocation)?.parentFile ?: kotlinHome).takeIf { it.isDirectory } + val baseDir = (tryGetResourcePathForClass(classFromJarInTheSameLocation)?.takeUnless { it.isDirectory }?.parentFile + ?: kotlinHome).takeIf { it.isDirectory } ?: return emptyList() val compilerJars = baseDir.listFiles { f: File -> COMPILER_JARS.any { expected ->