zig

commit 1658becb6221f9ffdbfd653c5e295501ac338794 (tree)
parent 5504f155aa83c7fc9a3610b2dcd38d0c1fc3a0c9
Author: LemonBoy <thatlemon@gmail.com>
Date:   Mon,  3 Feb 2020 15:24:07 +0100

fmt: Fix one more edge case in container formatting

Diffstat:
M
lib/std/zig/parser_test.zig
 | 
10
++++++++++
M
lib/std/zig/render.zig
 | 
2
++

2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
@@ -7,6 +7,16 @@ test "zig fmt: trailing comma in container declaration" {
         \\const X = struct { foo: i32 align(4) = 1, bar: i32 align(4) = 2 };
         \\
     );
+    try testCanonical(
+        \\test "" {
+        \\    comptime {
+        \\        const X = struct {
+        \\            x: i32
+        \\        };
+        \\    }
+        \\}
+        \\
+    );
     try testTransform(
         \\const X = struct {
         \\    foo: i32, bar: i8 };
diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig
@@ -1224,6 +1224,8 @@ fn renderExpression(
                     const space_after_decl: Space = if (it.peek() == null) .Newline else .Space;
                     try renderContainerDecl(allocator, stream, tree, new_indent, start_col, decl.*, space_after_decl);
                 }
+
+                try stream.writeByteNTimes(' ', indent);
             } else {
                 // All the declarations on the same line
                 try renderToken(tree, stream, container_decl.lbrace_token, indent, start_col, .Space); // {