starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-01-11 22:30:54 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Fix parsing of external property values containing = (#631)

Browse Source
This commit is contained in:
Philip K.F. Hölzenspies
2024-08-20 13:28:13 +01:00
committed by GitHub
parent e5b7e046d9
commit a8f24c9f13
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/BaseOptions.kt
View File

@@ -68,8 +68,8 @@ class BaseOptions : OptionGroup() {
fun RawOption.associateProps():
OptionWithValues<Map<String, String>, Pair<String, String>, Pair<String, String>> {
return convert {
val parts = it.split("=")
if (parts.size <= 1) parts[0] to "true" else parts[0] to parts[1]
val eq = it.indexOf('=')
if (eq == -1) it to "true" else it.substring(0, eq) to it.substring(eq + 1)
}
.multiple()
.toMap()

7
pkl-commons-cli/src/test/kotlin/org/pkl/commons/cli/BaseCommandTest.kt
View File

@@ -44,11 +44,12 @@ class BaseCommandTest {
}
@Test
fun `external properties without value default to 'true'`() {
cmd.parse(arrayOf("-p", "flag1", "-p", "flag2=", "-p", "FOO=bar"))
fun `difficult cases for external properties`() {
cmd.parse(arrayOf("-p", "flag1", "-p", "flag2=", "-p", "FOO=bar", "-p", "baz=qux=quux"))
val props = cmd.baseOptions.baseOptions(emptyList()).externalProperties
assertThat(props).isEqualTo(mapOf("flag1" to "true", "flag2" to "", "FOO" to "bar"))
assertThat(props)
.isEqualTo(mapOf("flag1" to "true", "flag2" to "", "FOO" to "bar", "baz" to "qux=quux"))
}
@Test