authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-05-28 17:09:55-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-05-28 17:09:55-04:00
log6c1fda3f99ebef60f4cb45b6bd66e76c85483c36
treedddfe914f93874f061bc6ab27654ca4d8ee56fce
parentfd13a757855e185b4250c65fe89bbd72c9479a52

zig fmt: fix switch body indent

2 files changed, 15 insertions(+), 3 deletions(-)

std/zig/parser_test.zig+12
...@@ -1,3 +1,15 @@...@@ -1,3 +1,15 @@
1test "zig fmt: switch comment before prong" {
2 try testCanonical(
3 \\comptime {
4 \\ switch (a) {
5 \\ // hi
6 \\ 0 => {},
7 \\ }
8 \\}
9 \\
10 );
11}
12
1test "zig fmt: struct literal no trailing comma" {13test "zig fmt: struct literal no trailing comma" {
2 try testTransform(14 try testTransform(
3 \\const a = foo{ .x = 1, .y = 2 };15 \\const a = foo{ .x = 1, .y = 2 };
std/zig/render.zig+3-3
...@@ -1050,11 +1050,11 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind...@@ -1050,11 +1050,11 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
10501050
1051 try renderExpression(allocator, stream, tree, indent, switch_node.expr, Space.None);1051 try renderExpression(allocator, stream, tree, indent, switch_node.expr, Space.None);
10521052
1053 try renderToken(tree, stream, rparen, indent, Space.Space); // )
1054 try renderToken(tree, stream, lbrace, indent, Space.Newline); // {
1055
1056 const new_indent = indent + indent_delta;1053 const new_indent = indent + indent_delta;
10571054
1055 try renderToken(tree, stream, rparen, indent, Space.Space); // )
1056 try renderToken(tree, stream, lbrace, new_indent, Space.Newline); // {
1057
1058 var it = switch_node.cases.iterator(0);1058 var it = switch_node.cases.iterator(0);
1059 while (it.next()) |node| {1059 while (it.next()) |node| {
1060 try stream.writeByteNTimes(' ', new_indent);1060 try stream.writeByteNTimes(' ', new_indent);