From fa42c99d82448c74a657d16e0f2e5f9877e364c0 Mon Sep 17 00:00:00 2001
From: Vexu <15308111+Vexu@users.noreply.github.com>
Date: Mon, 24 Jun 2019 10:29:58 +0300
Subject: [PATCH] fixed IfTypeExpr parsing

---
 std/zig/parse.zig       |  4 ++--
 std/zig/parser_test.zig | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/std/zig/parse.zig b/std/zig/parse.zig
index 7a8287db0c..da258c9237 100644
--- a/std/zig/parse.zig
+++ b/std/zig/parse.zig
@@ -2833,8 +2833,8 @@ fn parseIf(arena: *Allocator, it: *TokenIterator, tree: *Tree, bodyParseFn: Node
 
     const else_token = eatToken(it, .Keyword_else) orelse return node;
     const payload = try parsePayload(arena, it, tree);
-    const else_expr = try expectNode(arena, it, tree, parseExpr, AstError{
-        .ExpectedExpr = AstError.ExpectedExpr{ .token = it.index },
+    const else_expr = try expectNode(arena, it, tree, bodyParseFn, AstError{
+        .InvalidToken = AstError.InvalidToken{ .token = it.index },
     });
     const else_node = try arena.create(Node.Else);
     else_node.* = Node.Else{
diff --git a/std/zig/parser_test.zig b/std/zig/parser_test.zig
index 281f09d57b..3998ca5070 100644
--- a/std/zig/parser_test.zig
+++ b/std/zig/parser_test.zig
@@ -2234,6 +2234,18 @@ test "zig fmt: multiline string in array" {
     );
 }
 
+test "zig fmt: if type expr" {
+    try testCanonical(
+        \\const mycond = true;
+        \\pub fn foo() if (mycond) i32 else void {
+        \\    if (mycond) {
+        \\        return 42;
+        \\    }
+        \\}
+        \\
+    );
+}
+
 const std = @import("std");
 const mem = std.mem;
 const warn = std.debug.warn;