From b8d4e05361d6a01ae1c0bf931e27e2bfdb25551d Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 26 May 2018 18:29:14 -0400 Subject: zig fmt: handle empty block with comment inside --- std/zig/parser_test.zig | 11 +++++++++++ std/zig/render.zig | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3