Commit 371b21bdfbfa8917b44e809fb8a041411ffc6b8a | zig

author	Isaac Freund <mail@isaacfreund.com> 2021-02-24 13:46:11+01:00
committer	Isaac Freund <mail@isaacfreund.com> 2021-02-24 13:46:11+01:00
log	371b21bdfbfa8917b44e809fb8a041411ffc6b8a
tree	60e75816fba82121406b4fe094214e5a20f0ca28
parent	15c7c6ab970830a87b6aa502a369fb2b29b933c5
signature	Commit is signed but in an unrecognized format.

zig fmt: fix comment indent after multiline single statement if/while/for

2 files changed, 89 insertions(+), 33 deletions(-)

lib
- std
  - zig
    parser_test.zig
    render.zig

lib/std/zig/parser_test.zig+29-13

...	@@ -4164,19 +4164,35 @@ test "zig fmt: for loop with ptr payload and index" {	...	@@ -4164,19 +4164,35 @@ test "zig fmt: for loop with ptr payload and index" {
4164	);	4164	);
4165	}	4165	}
4166		4166
4167	// TODO	4167	test "zig fmt: proper indent line comment after multi-line single expr while loop" {
4168	//test "zig fmt: proper indent line comment after multi-line single expr while loop" {	4168	try testCanonical(
4169	// try testCanonical(	4169	\\test {
4170	// \\test {	4170	\\ while (a) : (b)
4171	// \\ while (a) : (b)	4171	\\ foo();
4172	// \\ foo();	4172	\\
4173	// \\	4173	\\ // bar
4174	// \\ // bar	4174	\\ baz();
4175	// \\ baz();	4175	\\}
4176	// \\}	4176	\\
4177	// \\	4177	);
4178	// );	4178	}
4179	//}	4179
		4180	test "zig fmt: line comment after multiline single expr if statement with multiline string" {
		4181	try testCanonical(
		4182	\\test {
		4183	\\ if (foo)
		4184	\\ x =
		4185	\\ \\hello
		4186	\\ \\hello
		4187	\\ \\
		4188	\\ ;
		4189	\\
		4190	\\ // bar
		4191	\\ baz();
		4192	\\}
		4193	\\
		4194	);
		4195	}
4180		4196
4181	test "zig fmt: respect extra newline between fn and pub usingnamespace" {	4197	test "zig fmt: respect extra newline between fn and pub usingnamespace" {
4182	try testCanonical(	4198	try testCanonical(

lib/std/zig/render.zig+60-20

 @@ -203,7 +203,9 @@ fn renderExpression(gpa: *Allocator, ais: *Ais, tree: ast.Tree, node: ast.Node.I
             switch (space) {
                 .none, .space, .newline => {},
+                .newline_pop => ais.popIndent(),
                 .semicolon => if (token_tags[i] == .semicolon) try renderToken(ais, tree, i, .newline),
+                .semicolon_pop => if (token_tags[i] == .semicolon) try renderToken(ais, tree, i, .newline_pop),
                 .comma => if (token_tags[i] == .comma) try renderToken(ais, tree, i, .newline),
                 .comma_space => if (token_tags[i] == .comma) try renderToken(ais, tree, i, .space),
             }
 @@ -1152,8 +1154,8 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full.
             }
         } else {
             ais.pushIndent();
-            try renderExpression(gpa, ais, tree, while_node.ast.then_expr, space);
+            assert(space == .semicolon);
-            ais.popIndent();
+            try renderExpression(gpa, ais, tree, while_node.ast.then_expr, .semicolon_pop);
             return;
         }
     }
 @@ -2196,6 +2198,9 @@ const Space = enum {
     space,
     /// Output the token lexeme followed by a newline.
     newline,
+    /// Same as newline, but pop an indent level before rendering the
+    /// following comments if any.
+    newline_pop,
     /// If the next token is a comma, render it as well. If not, insert one.
     /// In either case, a newline will be inserted afterwards.
     comma,
 @@ -2205,6 +2210,9 @@ const Space = enum {
     /// Additionally consume the next token if it is a semicolon.
     /// In either case, a newline will be inserted afterwards.
     semicolon,
+    /// Same as semicolon, but pop an indent level before rendering the
+    /// following comments if any.
+    semicolon_pop,
 };
 fn renderToken(ais: *Ais, tree: ast.Tree, token_index: ast.TokenIndex, space: Space) Error!void {
 @@ -2216,32 +2224,64 @@ fn renderToken(ais: *Ais, tree: ast.Tree, token_index: ast.TokenIndex, space: Sp
     try ais.writer().writeAll(lexeme);
-    if (space == .comma and token_tags[token_index + 1] != .comma) {
+    const token_end = token_start + lexeme.len;
-        try ais.writer().writeByte(',');
+    const next_token_start = token_starts[token_index + 1];
-    }
-    const comment = try renderComments(ais, tree, token_start + lexeme.len, token_starts[token_index + 1]);
     switch (space) {
-        .none => {},
+        .none => _ = try renderComments(ais, tree, token_end, next_token_start),
-        .space => if (!comment) try ais.writer().writeByte(' '),
-        .newline => if (!comment) try ais.insertNewline(),
-        .comma => if (token_tags[token_index + 1] == .comma) {
+        .space => if (!try renderComments(ais, tree, token_end, next_token_start)) {
-            try renderToken(ais, tree, token_index + 1, .newline);
+            try ais.writer().writeByte(' ');
-        } else if (!comment) {
+        },
+        .newline => if (!try renderComments(ais, tree, token_end, next_token_start)) {
             try ais.insertNewline();
         },
-        .comma_space => if (token_tags[token_index + 1] == .comma) {
+        .newline_pop => {
-            try renderToken(ais, tree, token_index + 1, .space);
+            ais.popIndent();
-        } else if (!comment) {
+            if (!try renderComments(ais, tree, token_end, next_token_start)) {
-            try ais.writer().writeByte(' ');
+                try ais.insertNewline();
+            }
         },
-        .semicolon => if (token_tags[token_index + 1] == .semicolon) {
+        .comma => if (token_tags[token_index + 1] == .comma) {
+            _ = try renderComments(ais, tree, token_end, next_token_start);
             try renderToken(ais, tree, token_index + 1, .newline);
-        } else if (!comment) {
+        } else {
-            try ais.insertNewline();
+            try ais.writer().writeByte(',');
+            if (!try renderComments(ais, tree, token_end, next_token_start)) {
+                try ais.insertNewline();
+            }
+        },
+        .comma_space => {
+            const comment = try renderComments(ais, tree, token_end, next_token_start);
+            if (token_tags[token_index + 1] == .comma) {
+                try renderToken(ais, tree, token_index + 1, .space);
+            } else if (!comment) {
+                try ais.writer().writeByte(' ');
+            }
+        },
+        .semicolon => {
+            const comment = try renderComments(ais, tree, token_end, next_token_start);
+            if (token_tags[token_index + 1] == .semicolon) {
+                try renderToken(ais, tree, token_index + 1, .newline);
+            } else if (!comment) {
+                try ais.insertNewline();
+            }
+        },
+        .semicolon_pop => {
+            if (token_tags[token_index + 1] == .semicolon) {
+                _ = try renderComments(ais, tree, token_end, next_token_start);
+                try renderToken(ais, tree, token_index + 1, .newline_pop);
+            } else {
+                ais.popIndent();
+                if (!try renderComments(ais, tree, token_end, next_token_start)) {
+                    try ais.insertNewline();
+                }
+            }
         },
     }
 }