Add newlines around list of structs am: 0cb1064428 am: d5be0c1c66 am: 2f36907173 am: a485b36980

Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977926

Change-Id: I48057a5c870a75f03766aae408e6cfc7ecad56d7

parser/printer.go

@@ -139,7 +139,7 @@ func (p *printer) printExpression(value Expression) {
 func (p *printer) printList(list []Expression, pos, endPos scanner.Position) {
 	p.requestSpace()
 	p.printToken("[", pos)
-	if len(list) > 1 || pos.Line != endPos.Line {
+	if len(list) > 1 || pos.Line != endPos.Line || listHasMap(list) {
 		p.requestNewline()
 		p.indent(p.curIndent() + 4)
 		for _, value := range list {
@@ -392,3 +392,12 @@ func max(a, b int) int {
 		return b
 	}
 }
+
+func listHasMap(list []Expression) bool {
+	for _, value := range list {
+		if _, ok := value.(*Map); ok {
+			return true
+		}
+	}
+	return false
+}

parser/printer_test.go

@@ -426,6 +426,27 @@ stuff {
         ],
     ],
 }
+`,
+	},
+	{
+		input: `
+// test
+stuff {
+    namespace: "google",
+    list_of_structs: [{ key1: "a", key2: "b" }],
+}
+`,
+		output: `
+// test
+stuff {
+    namespace: "google",
+    list_of_structs: [
+        {
+            key1: "a",
+            key2: "b",
+        },
+    ],
+}
 `,
 	},
 }