Skip to content

Quote kotlinc arguments with delimiters on Windows #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romainguy merged 1 commit into from
Dec 3, 2025
Merged

Quote kotlinc arguments with delimiters on Windows #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions src/jvmMain/kotlin/dev/romainguy/kotlin/explorer/build/KolinCompiler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package dev.romainguy.kotlin.explorer.build
import dev.romainguy.kotlin.explorer.DependencyCache
import dev.romainguy.kotlin.explorer.ProcessResult
import dev.romainguy.kotlin.explorer.ToolPaths
import dev.romainguy.kotlin.explorer.isWindows
import dev.romainguy.kotlin.explorer.process
import java.io.File
import java.nio.file.Path
Expand Down Expand Up @@ -77,8 +78,7 @@ class KotlinCompiler(
}
}.joinToString((File.pathSeparator)) { it.toString() }

val command = buildList {
add(toolPaths.kotlinc.toString())
val args = buildList {
add("-Xmulti-platform")
add("-classpath")
add(classpath)
Expand Down Expand Up @@ -107,16 +107,32 @@ class KotlinCompiler(
}
}

return command.toTypedArray()
return buildKotlincCommand(args)
}

private suspend fun getKotlinVersion(): String {
val command = mutableListOf(
toolPaths.kotlinc.toString(),
"-version",
).toTypedArray()
val command = buildKotlincCommand(listOf("-version"))
return process(*command).output.substringAfter("kotlinc-jvm ").substringBefore(" ")
}

private fun buildKotlincCommand(args: List<String>): Array<String> {
return buildList {
add(toolPaths.kotlinc.toString())
addAll(args.map { quoteIfNeeded(it) })
}.toTypedArray()
}

private fun quoteIfNeeded(arg: String): String {
val needsQuoting = isWindows && arg.any {
Character.isWhitespace(it) || it == '=' || it == ';' || it == ','
}

return if (needsQuoting) {
"\"$arg\""
} else {
arg
}
}
}

private fun Path.isCompose(): Boolean {
Expand Down
Loading