Skip to content

Commit 8f959fa

Browse files
authored
Fix escaping of strings in yaml lists in ./mill init (#6798)
fixes #6795
1 parent 5becc0c commit 8f959fa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

libs/init/buildgen/src/mill/main/buildgen/BuildGenYaml.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,15 +379,15 @@ object BuildGenYaml extends BuildGen {
379379
if (flatOpts.isEmpty) Nil
380380
else {
381381
val appendTag = if (values.appendSuper) "!append " else ""
382-
Seq(s"$name: $appendTag${renderYamlStringList(flatOpts)}")
382+
Seq(s"$name: $appendTag${renderYamlStringList(flatOpts.map(yamlEscapeStringInList))}")
383383
}
384384
}
385385

386386
private def renderYamlStringListValuesPlain(name: String, values: Values[String]): Seq[String] = {
387387
if (values.base.isEmpty) Nil
388388
else {
389389
val appendTag = if (values.appendSuper) "!append " else ""
390-
Seq(s"$name: $appendTag${renderYamlStringList(values.base)}")
390+
Seq(s"$name: $appendTag${renderYamlStringList(values.base.map(yamlEscapeStringInList))}")
391391
}
392392
}
393393

libs/init/gradle/test/resources/expected/gradle-6-0/build.mill.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extends: MavenModule
44
mvnDeps:
55
- com.google.guava:guava:28.0-jre
66
javacOptions: [-source, 11, -target, 11]
7-
repositories: [https://jcenter.bintray.com/]
7+
repositories: ["https://jcenter.bintray.com/"]
88

99
object test:
1010
extends: [MavenTests, TestModule.TestNg]

0 commit comments

Comments
 (0)