tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix extra newline after multiline select case bodies" into main am: a3684d5d61 am: 27a62c91fd

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

Change-Id: I2abc6637687769141ee9a2901fc2d5c9ec953a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-06-14 00:04:56 +00:00 committed by Automerger Merge Worker
commit ad07561c07
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
parser/printer.go
View file

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

37
parser/printer_test.go
View file

@ -696,6 +696,43 @@ foo {
(default, default): "b", (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: [],
}),
}
`, `,
}, },
} }