authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-04-29 19:55:57-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-04-29 19:55:57-04:00
logc53209a8a8cee014382a735b3baa7cd439106c6f
tree1109201249a486bde629356928ba6fed283fee54
parent3235eb03f979cbcc38cbe8b69d55761079e6d864

zig fmt: comments before var decl in struct

2 files changed, 45 insertions(+), 14 deletions(-)

std/zig/parser.zig+17-9
......@@ -230,6 +230,7 @@ pub const Parser = struct {
230230 Semicolon: &&ast.Node,
231231 AddComments: AddCommentsCtx,
232232 LookForSameLineComment: &&ast.Node,
233 LookForSameLineCommentDirect: &ast.Node,
233234
234235 AsmOutputItems: &ArrayList(&ast.Node.AsmOutput),
235236 AsmOutputReturnOrType: &ast.Node.AsmOutput,
......@@ -532,7 +533,7 @@ pub const Parser = struct {
532533 }
533534 }
534535
535 stack.append(State {
536 try stack.append(State {
536537 .VarDecl = VarDeclCtx {
537538 .comments = ctx.comments,
538539 .visib_token = ctx.visib_token,
......@@ -542,7 +543,7 @@ pub const Parser = struct {
542543 .mut_token = token,
543544 .list = ctx.decls
544545 }
545 }) catch unreachable;
546 });
546547 continue;
547548 },
548549 Token.Id.Keyword_fn, Token.Id.Keyword_nakedcc,
......@@ -705,6 +706,7 @@ pub const Parser = struct {
705706 continue;
706707 },
707708 State.ContainerDecl => |container_decl| {
709 const comments = try self.eatComments(arena);
708710 const token = self.getNextToken();
709711 switch (token.id) {
710712 Token.Id.Identifier => {
......@@ -713,7 +715,7 @@ pub const Parser = struct {
713715 const node = try arena.construct(ast.Node.StructField {
714716 .base = ast.Node {
715717 .id = ast.Node.Id.StructField,
716 .before_comments = null,
718 .before_comments = comments,
717719 .same_line_comment = null,
718720 },
719721 .visib_token = null,
......@@ -765,7 +767,7 @@ pub const Parser = struct {
765767 .TopLevelExternOrField = TopLevelExternOrFieldCtx {
766768 .visib_token = token,
767769 .container_decl = container_decl,
768 .comments = null,
770 .comments = comments,
769771 }
770772 });
771773 continue;
......@@ -778,7 +780,7 @@ pub const Parser = struct {
778780 .visib_token = token,
779781 .extern_export_inline_token = null,
780782 .lib_name = null,
781 .comments = null,
783 .comments = comments,
782784 }
783785 });
784786 continue;
......@@ -793,7 +795,7 @@ pub const Parser = struct {
793795 .visib_token = token,
794796 .extern_export_inline_token = null,
795797 .lib_name = null,
796 .comments = null,
798 .comments = comments,
797799 }
798800 });
799801 continue;
......@@ -811,7 +813,7 @@ pub const Parser = struct {
811813 .visib_token = null,
812814 .extern_export_inline_token = null,
813815 .lib_name = null,
814 .comments = null,
816 .comments = comments,
815817 }
816818 });
817819 continue;
......@@ -842,7 +844,8 @@ pub const Parser = struct {
842844 });
843845 try ctx.list.append(&var_decl.base);
844846
845 stack.append(State { .VarDeclAlign = var_decl }) catch unreachable;
847 try stack.append(State { .LookForSameLineCommentDirect = &var_decl.base });
848 try stack.append(State { .VarDeclAlign = var_decl });
846849 try stack.append(State { .TypeExprBegin = OptionalCtx { .RequiredNull = &var_decl.type_node} });
847850 try stack.append(State { .IfToken = Token.Id.Colon });
848851 try stack.append(State {
......@@ -854,7 +857,7 @@ pub const Parser = struct {
854857 continue;
855858 },
856859 State.VarDeclAlign => |var_decl| {
857 stack.append(State { .VarDeclEq = var_decl }) catch unreachable;
860 try stack.append(State { .VarDeclEq = var_decl });
858861
859862 const next_token = self.getNextToken();
860863 if (next_token.id == Token.Id.Keyword_align) {
......@@ -1348,6 +1351,11 @@ pub const Parser = struct {
13481351 continue;
13491352 },
13501353
1354 State.LookForSameLineCommentDirect => |node| {
1355 try self.lookForSameLineComment(arena, node);
1356 continue;
1357 },
1358
13511359
13521360 State.AsmOutputItems => |items| {
13531361 const lbracket = self.getNextToken();
std/zig/parser_test.zig+28-5
......@@ -1,4 +1,27 @@
1test "zig fmt: line comment after field decl" {
1test "zig fmt: comments before var decl in struct" {
2 try testCanonical(
3 \\pub const vfs_cap_data = extern struct {
4 \\ // All of these are mandated as little endian
5 \\ // when on disk.
6 \\ const Data = struct {
7 \\ permitted: u32,
8 \\ inheritable: u32,
9 \\ };
10 \\};
11 \\
12 );
13}
14
15test "zig fmt: same-line comment after var decl in struct" {
16 try testCanonical(
17 \\pub const vfs_cap_data = extern struct {
18 \\ const Data = struct {}; // when on disk.
19 \\};
20 \\
21 );
22}
23
24test "zig fmt: same-line comment after field decl" {
225 try testCanonical(
326 \\pub const dirent = extern struct {
427 \\ d_name: u8,
......@@ -18,7 +41,7 @@ test "zig fmt: array literal with 1 item on 1 line" {
1841 );
1942}
2043
21test "zig fmt: preserve same-line comment after a statement" {
44test "zig fmt: same-line comment after a statement" {
2245 try testCanonical(
2346 \\test "" {
2447 \\ a = b;
......@@ -29,7 +52,7 @@ test "zig fmt: preserve same-line comment after a statement" {
2952 );
3053}
3154
32test "zig fmt: preserve comments before global variables" {
55test "zig fmt: comments before global variables" {
3356 try testCanonical(
3457 \\/// Foo copies keys and values before they go into the map, and
3558 \\/// frees them when they get removed.
......@@ -38,7 +61,7 @@ test "zig fmt: preserve comments before global variables" {
3861 );
3962}
4063
41test "zig fmt: preserve comments before statements" {
64test "zig fmt: comments before statements" {
4265 try testCanonical(
4366 \\test "std" {
4467 \\ // statement comment
......@@ -48,7 +71,7 @@ test "zig fmt: preserve comments before statements" {
4871 );
4972}
5073
51test "zig fmt: preserve top level comments" {
74test "zig fmt: comments before test decl" {
5275 try testCanonical(
5376 \\// top level comment
5477 \\test "hi" {}