From 7295d4b8079b5cf3fcdbb81dd9e129f3f0f139aa Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Tue, 9 Feb 2021 20:35:43 -0700
Subject: [PATCH] zig fmt: suspend blocks

---
 lib/std/zig/ast.zig         | 21 +++++++++++++++++++--
 lib/std/zig/parser_test.zig | 24 ++++++++++++------------
 lib/std/zig/render.zig      | 21 ++++++++++-----------
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/lib/std/zig/ast.zig b/lib/std/zig/ast.zig
index aa6962c247..8caafa73c8 100644
--- a/lib/std/zig/ast.zig
+++ b/lib/std/zig/ast.zig
@@ -459,7 +459,6 @@ pub const Tree = struct {
             .Try,
             .Await,
             .OptionalType,
-            .Suspend,
             .Resume,
             .Nosuspend,
             .Comptime,
@@ -625,7 +624,6 @@ pub const Tree = struct {
             },
 
             .ArrayInitDotTwo,
-            .BuiltinCallTwo,
             .BlockTwo,
             .StructInitDotTwo,
             .ContainerDeclTwo,
@@ -640,6 +638,18 @@ pub const Tree = struct {
                     return main_tokens[n] + end_offset;
                 }
             },
+            .BuiltinCallTwo => {
+                if (datas[n].rhs != 0) {
+                    end_offset += 1; // for the rparen/rbrace
+                    n = datas[n].rhs;
+                } else if (datas[n].lhs != 0) {
+                    end_offset += 1; // for the rparen/rbrace
+                    n = datas[n].lhs;
+                } else {
+                    end_offset += 2; // for the lparen and rparen
+                    return main_tokens[n] + end_offset;
+                }
+            },
             .ArrayInitDotTwoComma,
             .BuiltinCallTwoComma,
             .BlockTwoSemicolon,
@@ -861,6 +871,13 @@ pub const Tree = struct {
                 assert(extra.else_expr != 0);
                 n = extra.else_expr;
             },
+            .Suspend => {
+                if (datas[n].lhs != 0) {
+                    n = datas[n].lhs;
+                } else {
+                    return main_tokens[n] + end_offset;
+                }
+            },
 
             // These are not supported by lastToken() because implementation would
             // require recursion due to the optional comma followed by rbrace.
diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
index 0adcf68568..7c7ecd2499 100644
--- a/lib/std/zig/parser_test.zig
+++ b/lib/std/zig/parser_test.zig
@@ -2124,18 +2124,18 @@ test "zig fmt: error set declaration" {
 //        \\
 //    );
 //}
-//
-//test "zig fmt: resume from suspend block" {
-//    try testCanonical(
-//        \\fn foo() void {
-//        \\    suspend {
-//        \\        resume @frame();
-//        \\    }
-//        \\}
-//        \\
-//    );
-//}
-//
+
+test "zig fmt: resume from suspend block" {
+    try testCanonical(
+        \\fn foo() void {
+        \\    suspend {
+        \\        resume @frame();
+        \\    }
+        \\}
+        \\
+    );
+}
+
 //test "zig fmt: comments before error set decl" {
 //    try testCanonical(
 //        \\const UnexpectedError = error{
diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig
index 32ae6f4876..dd1c6d62f8 100644
--- a/lib/std/zig/render.zig
+++ b/lib/std/zig/render.zig
@@ -238,17 +238,16 @@ fn renderExpression(ais: *Ais, tree: ast.Tree, node: ast.Node.Index, space: Spac
             return renderExpression(ais, tree, block, space);
         },
 
-        .Suspend => unreachable, // TODO
-        //.Suspend => {
-        //    const suspend_node = @fieldParentPtr(ast.Node.Suspend, "base", base);
-
-        //    if (suspend_node.body) |body| {
-        //        try renderToken(ais, tree, suspend_node.suspend_token, Space.Space);
-        //        return renderExpression(ais, tree, body, space);
-        //    } else {
-        //        return renderToken(ais, tree, suspend_node.suspend_token, space);
-        //    }
-        //},
+        .Suspend => {
+            const suspend_token = main_tokens[node];
+            const body = datas[node].lhs;
+            if (body != 0) {
+                try renderToken(ais, tree, suspend_token, .Space);
+                return renderExpression(ais, tree, body, space);
+            } else {
+                return renderToken(ais, tree, suspend_token, space);
+            }
+        },
 
         .Catch => {
             const main_token = main_tokens[node];