Merge "Fix extra newline after multiline select case bodies" into main

parser/printer.go

@@ -227,7 +227,7 @@ func (p *printer) printSelect(s *Select) {
 		} else {
 			p.printExpression(c.Value)
 		}
-		p.printToken(",", c.Value.Pos())
+		p.printToken(",", c.Value.End())
 	}
 	p.requestNewline()
 	p.unindent(s.RBracePos)

parser/printer_test.go

@@ -696,6 +696,43 @@ foo {
         (default, default): "b",
     }),
 }
+`,
+	},
+	{
+		name: "Select with multiline inner expression",
+		input: `
+foo {
+    cflags: [
+        "-DPRODUCT_COMPATIBLE_PROPERTY",
+        "-DRIL_SHLIB",
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ] + select(soong_config_variable("sim", "sim_count"), {
+        "2": [
+            "-DANDROID_MULTI_SIM",
+            "-DANDROID_SIM_COUNT_2",
+        ],
+        default: [],
+    }),
+}
+`,
+		output: `
+foo {
+    cflags: [
+        "-DPRODUCT_COMPATIBLE_PROPERTY",
+        "-DRIL_SHLIB",
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+    ] + select(soong_config_variable("sim", "sim_count"), {
+        "2": [
+            "-DANDROID_MULTI_SIM",
+            "-DANDROID_SIM_COUNT_2",
+        ],
+        default: [],
+    }),
+}
 `,
 	},
 }