aboutsummaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2018-05-26 18:29:14 -0400
committerAndrew Kelley <superjoe30@gmail.com>2018-05-26 18:29:14 -0400
commitb8d4e05361d6a01ae1c0bf931e27e2bfdb25551d (patch)
tree12eed9b8a6ea2abe1a2d841691672cc9d6ebe4f7 /std
parent7e900d28be00e03eee2ec3703c0c45247b4748b1 (diff)
downloadzig-b8d4e05361d6a01ae1c0bf931e27e2bfdb25551d.tar.gz
zig-b8d4e05361d6a01ae1c0bf931e27e2bfdb25551d.zip
zig fmt: handle empty block with comment inside
Diffstat (limited to 'std')
-rw-r--r--std/zig/parser_test.zig11
-rw-r--r--std/zig/render.zig2
2 files changed, 12 insertions, 1 deletions
diff --git a/std/zig/parser_test.zig b/std/zig/parser_test.zig
index dfef594df7..c115c5848f 100644
--- a/std/zig/parser_test.zig
+++ b/std/zig/parser_test.zig
@@ -1,3 +1,14 @@
+test "zig fmt: empty block with only comment" {
+ try testCanonical(
+ \\comptime {
+ \\ {
+ \\ // comment
+ \\ }
+ \\}
+ \\
+ );
+}
+
test "zig fmt: no trailing comma on struct decl" {
try testTransform(
\\const RoundParam = struct {
diff --git a/std/zig/render.zig b/std/zig/render.zig
index 67ec8f7632..90acb0e412 100644
--- a/std/zig/render.zig
+++ b/std/zig/render.zig
@@ -1519,7 +1519,7 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
const after_comment_token = tree.tokens.at(token_index + offset);
const next_line_indent = switch (after_comment_token.id) {
- Token.Id.RParen, Token.Id.RBrace, Token.Id.RBracket => indent,
+ Token.Id.RParen, Token.Id.RBrace, Token.Id.RBracket => indent - indent_delta,
else => indent,
};
try stream.writeByteNTimes(' ', next_line_indent);