diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-05-26 23:17:24 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-05-26 23:25:04 -0400 |
| commit | afdfbc0367b261ea43d5618027e23022c01e2c93 (patch) | |
| tree | 69ad57dfa99ccd0043a12c743fc75255bbd22b28 /std | |
| parent | b184ae5ca5d3d3c0a4b9de564a6e30555e596e65 (diff) | |
| download | zig-afdfbc0367b261ea43d5618027e23022c01e2c93.tar.gz zig-afdfbc0367b261ea43d5618027e23022c01e2c93.zip | |
zig fmt: delete empty comments that do nothing
Diffstat (limited to 'std')
| -rw-r--r-- | std/zig/parser_test.zig | 16 | ||||
| -rw-r--r-- | std/zig/render.zig | 9 |
2 files changed, 23 insertions, 2 deletions
diff --git a/std/zig/parser_test.zig b/std/zig/parser_test.zig index 909220a6f6..a2ee77796b 100644 --- a/std/zig/parser_test.zig +++ b/std/zig/parser_test.zig @@ -28,6 +28,12 @@ test "zig fmt: array literal with hint" { \\ 5, \\ 6, \\ 7 }; + \\const a = []u8{ + \\ 1, 2, + \\ 3, 4, // + \\ 5, 6, // + \\ 7, 8, // + \\}; , \\const a = []u8{ \\ 1, 2, // @@ -53,6 +59,16 @@ test "zig fmt: array literal with hint" { \\ 5, 6, // \\ 7, \\}; + \\const a = []u8{ + \\ 1, + \\ 2, + \\ 3, + \\ 4, + \\ 5, + \\ 6, + \\ 7, + \\ 8, + \\}; \\ ); } diff --git a/std/zig/render.zig b/std/zig/render.zig index fa3755b719..49138e0e78 100644 --- a/std/zig/render.zig +++ b/std/zig/render.zig @@ -1583,8 +1583,13 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent } } - if (space == Space.IgnoreEmptyComment and mem.trimRight(u8, tree.tokenSlicePtr(next_token), " ").len == 2) { - return stream.writeByte(' '); + const comment_is_empty = mem.trimRight(u8, tree.tokenSlicePtr(next_token), " ").len == 2; + if (comment_is_empty) { + switch (space) { + Space.IgnoreEmptyComment => return stream.writeByte(' '), + Space.Newline => return stream.writeByte('\n'), + else => {}, + } } var loc = tree.tokenLocationPtr(token.end, next_token); |
