From f069686a14ca3c1c98adc04719f1a9045911ac3f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 20 Aug 2018 11:34:04 +0200 Subject: [PATCH] Minor, use resolveSibling in getAbsolutePaths --- .../kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt index c0b457b3846..aa1f0274fc9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt @@ -218,12 +218,7 @@ object KotlinToJVMBytecodeCompiler { private fun getAbsolutePaths(buildFile: File, sourceFilePaths: List): List = sourceFilePaths.map { path -> - val sourceFile = File(path) - if (!sourceFile.isAbsolute) { - File(buildFile.absoluteFile.parentFile, path).absolutePath - } else { - sourceFile.absolutePath - } + (File(path).takeIf(File::isAbsolute) ?: buildFile.resolveSibling(path)).absolutePath } private fun findMainClass(generationState: GenerationState, files: List): FqName? {