aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVexu <git@vexu.eu>2020-05-17 15:13:19 +0300
committerVexu <git@vexu.eu>2020-05-17 15:13:19 +0300
commit28d449b38d6bbf4081bed9fc58685fd5ca36423f (patch)
tree5e9594566275324b297045333597ccd15d9f16aa
parente5ffb94911b23ed916b52a28d8d91aa3f9ebc171 (diff)
downloadzig-28d449b38d6bbf4081bed9fc58685fd5ca36423f.tar.gz
zig-28d449b38d6bbf4081bed9fc58685fd5ca36423f.zip
fix zig fmt regression
-rw-r--r--lib/std/zig/parse.zig2
-rw-r--r--lib/std/zig/parser_test.zig10
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/std/zig/parse.zig b/lib/std/zig/parse.zig
index 001799e0b1..6dfd1120b6 100644
--- 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
index ef8779e7f6..186a59e74d 100644
--- 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,