Skip to content

fix: expand Windows %IDE_HOME% in MPS bootstrap JVM arguments #112

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
sergej-koscejev merged 1 commit into from
Oct 23, 2026
Merged

fix: expand Windows %IDE_HOME% in MPS bootstrap JVM arguments #112

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion cli/src/main/kotlin/com/specificlanguages/mops/daemoncomms/FullClasspathDaemonLauncher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,9 @@ class FullClasspathDaemonLauncher(
mpsHome.resolve("Resources/product-info.json"),
).firstOrNull(Files::isRegularFile) ?: return emptyList()
val launch = selectMpsLaunch(readMpsLaunches(descriptor), hostPlatform(osName, osArch, descriptor), descriptor)
return launch.bootstrapJvmArgs.map { it.replace("\$IDE_HOME", mpsHome.pathString) }
return launch.bootstrapJvmArgs.map {
it.replace("%IDE_HOME%", mpsHome.pathString).replace("\$IDE_HOME", mpsHome.pathString)
}
}

private fun readMpsLaunches(descriptor: Path): List<MpsLaunch> =
Expand Down
14 changes: 14 additions & 0 deletions cli/src/test/kotlin/com/specificlanguages/mops/cli/FullClasspathDaemonLauncherTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,20 @@ class FullClasspathDaemonLauncherTest {
assertEquals(emptyList(), FullClasspathDaemonLauncher.mpsBootstrapJvmArgs(tempDir, "Linux", "amd64"))
}

@Test
fun `bootstrap classpath resolves Windows IDE home placeholder in a path with spaces`() {
val mpsHome = tempDir.resolve("Program Files/JetBrains/MPS 2026.2").createDirectories()
mpsHome.resolve("product-info.json").writeText(
"""{"launch":[{"os":"Windows","arch":"amd64","bootClassPathJarNames":[],
"additionalJvmArguments":["-Xbootclasspath/a:%IDE_HOME%/lib/nio-fs.jar"]}]}""",
)

assertEquals(
listOf("-Xbootclasspath/a:$mpsHome/lib/nio-fs.jar"),
FullClasspathDaemonLauncher.mpsBootstrapJvmArgs(mpsHome, "Windows 11", "amd64"),
)
}

@Test
fun `exact host launch entry is preferred`() {
val mpsHome = tempDir.resolve("mps").createDirectories()
Expand Down
Loading