zig

commit 4420fe97bebbecfb595c8acad255c3f3747bcaef (tree)
parent 988f1c6a6f075e63d0ab2dc8f6e802a67b4a0902
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Tue, 23 Feb 2021 18:33:13 -0700

zig fmt: for loop with ptr payload and index

Diffstat:
M
lib/std/zig/parser_test.zig
 | 
12
++++++++++++
M
lib/std/zig/render.zig
 | 
6
+++---

2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
@@ -4152,6 +4152,18 @@ test "zig fmt: space after top level doc comment" {
     );
 }
 
+test "zig fmt: for loop with ptr payload and index" {
+    try testCanonical(
+        \\test {
+        \\    for (self.entries.items) |*item, i| {}
+        \\    for (self.entries.items) |*item, i|
+        \\        a = b;
+        \\    for (self.entries.items) |*item, i| a = b;
+        \\}
+        \\
+    );
+}
+
 test "zig fmt: error for invalid bit range" {
     try testError(
         \\var x: []align(0:0:0)u8 = bar;
diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig
@@ -1040,7 +1040,7 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full.
                 if (token_tags[ident + 1] == .comma) {
                     try renderToken(ais, tree, ident + 1, .space); // ,
                     try renderToken(ais, tree, ident + 2, .none); // index
-                    break :blk payload_token + 3;
+                    break :blk ident + 3;
                 } else {
                     break :blk ident + 1;
                 }
@@ -1102,7 +1102,7 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full.
                 if (token_tags[ident + 1] == .comma) {
                     try renderToken(ais, tree, ident + 1, .space); // ,
                     try renderToken(ais, tree, ident + 2, .none); // index
-                    break :blk payload_token + 3;
+                    break :blk ident + 3;
                 } else {
                     break :blk ident + 1;
                 }
@@ -1177,7 +1177,7 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full.
             if (token_tags[ident + 1] == .comma) {
                 try renderToken(ais, tree, ident + 1, .space); // ,
                 try renderToken(ais, tree, ident + 2, .none); // index
-                break :blk payload_token + 3;
+                break :blk ident + 3;
             } else {
                 break :blk ident + 1;
             }