authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-04-29 21:27:44-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-04-29 21:27:44-04:00
loga912c7d75f61fb127ff8552e7a10ffe4672ac1aa
treea506b13b193db14c26a15baf6f40b05559d15a7a
parentc53209a8a8cee014382a735b3baa7cd439106c6f

zig fmt: same-line comment after switch prong

2 files changed, 36 insertions(+), 17 deletions(-)

std/zig/parser.zig+24-17
......@@ -1505,11 +1505,11 @@ pub const Parser = struct {
15051505 if (try self.expectCommaOrEnd(Token.Id.RBrace)) |end| {
15061506 container_decl.rbrace_token = end;
15071507 continue;
1508 } else {
1509 try self.lookForSameLineComment(arena, container_decl.fields_and_decls.toSlice()[container_decl.fields_and_decls.len - 1]);
1510 try stack.append(State { .ContainerDecl = container_decl });
1511 continue;
15121508 }
1509
1510 try self.lookForSameLineComment(arena, container_decl.fields_and_decls.toSlice()[container_decl.fields_and_decls.len - 1]);
1511 try stack.append(State { .ContainerDecl = container_decl });
1512 continue;
15131513 },
15141514 State.IdentifierListItemOrEnd => |list_state| {
15151515 if (self.eatToken(Token.Id.RBrace)) |rbrace| {
......@@ -1536,30 +1536,36 @@ pub const Parser = struct {
15361536 continue;
15371537 }
15381538
1539 const node = try self.createNode(arena, ast.Node.SwitchCase,
1540 ast.Node.SwitchCase {
1541 .base = undefined,
1542 .items = ArrayList(&ast.Node).init(arena),
1543 .payload = null,
1544 .expr = undefined,
1545 }
1546 );
1539 const node = try arena.construct(ast.Node.SwitchCase {
1540 .base = ast.Node {
1541 .id = ast.Node.Id.SwitchCase,
1542 .before_comments = null,
1543 .same_line_comment = null,
1544 },
1545 .items = ArrayList(&ast.Node).init(arena),
1546 .payload = null,
1547 .expr = undefined,
1548 });
15471549 try list_state.list.append(node);
1548 stack.append(State { .SwitchCaseCommaOrEnd = list_state }) catch unreachable;
1550 try stack.append(State { .SwitchCaseCommaOrEnd = list_state });
15491551 try stack.append(State { .AssignmentExpressionBegin = OptionalCtx { .Required = &node.expr } });
15501552 try stack.append(State { .PointerPayload = OptionalCtx { .Optional = &node.payload } });
15511553 try stack.append(State { .SwitchCaseFirstItem = &node.items });
15521554 continue;
15531555 },
1556
15541557 State.SwitchCaseCommaOrEnd => |list_state| {
15551558 if (try self.expectCommaOrEnd(Token.Id.RBrace)) |end| {
15561559 *list_state.ptr = end;
15571560 continue;
1558 } else {
1559 stack.append(State { .SwitchCaseOrEnd = list_state }) catch unreachable;
1560 continue;
15611561 }
1562
1563 const switch_case = list_state.list.toSlice()[list_state.list.len - 1];
1564 try self.lookForSameLineComment(arena, &switch_case.base);
1565 try stack.append(State { .SwitchCaseOrEnd = list_state });
1566 continue;
15621567 },
1568
15631569 State.SwitchCaseFirstItem => |case_items| {
15641570 const token = self.getNextToken();
15651571 if (token.id == Token.Id.Keyword_else) {
......@@ -4095,7 +4101,6 @@ pub const Parser = struct {
40954101 while (i != 0) {
40964102 i -= 1;
40974103 const node = cases[i];
4098 try stack.append(RenderState { .Text = ","});
40994104 try stack.append(RenderState { .Expression = &node.base});
41004105 try stack.append(RenderState.PrintIndent);
41014106 try stack.append(RenderState {
......@@ -4118,6 +4123,8 @@ pub const Parser = struct {
41184123 ast.Node.Id.SwitchCase => {
41194124 const switch_case = @fieldParentPtr(ast.Node.SwitchCase, "base", base);
41204125
4126 try stack.append(RenderState { .PrintSameLineComment = switch_case.base.same_line_comment });
4127 try stack.append(RenderState { .Text = "," });
41214128 try stack.append(RenderState { .Expression = switch_case.expr });
41224129 if (switch_case.payload) |payload| {
41234130 try stack.append(RenderState { .Text = " " });
std/zig/parser_test.zig+12
......@@ -1,3 +1,15 @@
1test "zig fmt: same-line comment after switch prong" {
2 try testCanonical(
3 \\test "" {
4 \\ switch (err) {
5 \\ error.PathAlreadyExists => {}, // comment 2
6 \\ else => return err, // comment 1
7 \\ }
8 \\}
9 \\
10 );
11}
12
113test "zig fmt: comments before var decl in struct" {
214 try testCanonical(
315 \\pub const vfs_cap_data = extern struct {