zig

commit 241984987b394ea73ff17fa60846b1e0e85e3433 (tree)
parent e5ffb94911b23ed916b52a28d8d91aa3f9ebc171
Author: Veikka Tuominen <git@vexu.eu>
Date:   Sun, 17 May 2020 17:43:25 +0300

Merge pull request #5367 from Vexu/fix

Fix zig fmt regression
Diffstat:
M
lib/std/zig/parse.zig
 | 
2
+-
M
lib/std/zig/parser_test.zig
 | 
10
++++++++++

2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/lib/std/zig/parse.zig b/lib/std/zig/parse.zig
@@ -732,7 +732,7 @@ fn parseIfStatement(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node 
 
     const block_expr = (try parseBlockExpr(arena, it, tree));
     const assign_expr = if (block_expr == null)
-        try expectNode(arena, it, tree, parseAdditionExpr, .{
+        try expectNode(arena, it, tree, parseAssignExpr, .{
             .ExpectedBlockOrAssignment = .{ .token = it.index },
         })
     else
diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
@@ -208,6 +208,16 @@ test "recovery: invalid comptime" {
     });
 }
 
+test "zig fmt: if statment" {
+    try testCanonical(
+        \\test "" {
+        \\    if (optional()) |some|
+        \\        bar = some.foo();
+        \\}
+        \\
+    );
+}
+
 test "zig fmt: top-level fields" {
     try testCanonical(
         \\a: did_you_know,