Commit c9bc8b9d0cf1ca7d21ddb60d08a4cdd0730a253d | zig

author	Veikka Tuominen <git@vexu.eu> 2020-12-09 12:58:04+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-12-11 00:39:52-07:00
log	c9bc8b9d0cf1ca7d21ddb60d08a4cdd0730a253d
tree	66f2177fb1a886b135ace7ff0dfbf15976c021bb
parent	fd4c98cbb7af337895f003d83d6cd2fb3447d6c2

zig fmt: improve var decl initializer formatting

2 files changed, 72 insertions(+), 20 deletions(-)

lib
- std
  - zig
    parser_test.zig
    render.zig

lib/std/zig/parser_test.zig+47-1

...	@@ -274,6 +274,51 @@ test "recovery: missing block after for/while loops" {	...	@@ -274,6 +274,51 @@ test "recovery: missing block after for/while loops" {
274	});	274	});
275	}	275	}
276		276
		277	test "zig fmt: respect line breaks after var declarations" {
		278	try testCanonical(
		279	\\const crc =
		280	\\ lookup_tables[0][p[7]] ^
		281	\\ lookup_tables[1][p[6]] ^
		282	\\ lookup_tables[2][p[5]] ^
		283	\\ lookup_tables[3][p[4]] ^
		284	\\ lookup_tables[4][@truncate(u8, self.crc >> 24)] ^
		285	\\ lookup_tables[5][@truncate(u8, self.crc >> 16)] ^
		286	\\ lookup_tables[6][@truncate(u8, self.crc >> 8)] ^
		287	\\ lookup_tables[7][@truncate(u8, self.crc >> 0)];
		288	\\
		289	);
		290	}
		291
		292	test "zig fmt: multiline string mixed with comments" {
		293	try testCanonical(
		294	\\const s1 =
		295	\\ //\\one
		296	\\ \\two)
		297	\\ \\three
		298	\\;
		299	\\const s2 =
		300	\\ \\one
		301	\\ \\two)
		302	\\ //\\three
		303	\\;
		304	\\const s3 =
		305	\\ \\one
		306	\\ //\\two)
		307	\\ \\three
		308	\\;
		309	\\const s4 =
		310	\\ \\one
		311	\\ //\\two
		312	\\ \\three
		313	\\ //\\four
		314	\\ \\five
		315	\\;
		316	\\const a =
		317	\\ 1;
		318	\\
		319	);
		320	}
		321
277	test "zig fmt: empty file" {	322	test "zig fmt: empty file" {
278	try testCanonical(	323	try testCanonical(
279	\\	324	\\
...	@@ -3224,7 +3269,8 @@ test "zig fmt: integer literals with underscore separators" {	...	@@ -3224,7 +3269,8 @@ test "zig fmt: integer literals with underscore separators" {
3224	\\ 1_234_567	3269	\\ 1_234_567
3225	\\ +(0b0_1-0o7_0+0xff_FF ) + 0_0;	3270	\\ +(0b0_1-0o7_0+0xff_FF ) + 0_0;
3226	,	3271	,
3227	\\const x = 1_234_567 + (0b0_1 - 0o7_0 + 0xff_FF) + 0_0;	3272	\\const x =
		3273	\\ 1_234_567 + (0b0_1 - 0o7_0 + 0xff_FF) + 0_0;
3228	\\	3274	\\
3229	);	3275	);
3230	}	3276	}

lib/std/zig/render.zig+25-19

 @@ -2209,10 +2209,10 @@ fn renderAsmOutput(
     try ais.writer().writeAll(" (");
     switch (asm_output.kind) {
-        ast.Node.Asm.Output.Kind.Variable => |variable_name| {
+        .Variable => |variable_name| {
             try renderExpression(allocator, ais, tree, &variable_name.base, Space.None);
         },
-        ast.Node.Asm.Output.Kind.Return => |return_type| {
+        .Return => |return_type| {
             try ais.writer().writeAll("-> ");
             try renderExpression(allocator, ais, tree, return_type, Space.None);
         },
 @@ -2304,8 +2304,17 @@ fn renderVarDecl(
     }
     if (var_decl.getInitNode()) |init_node| {
-        const s = if (init_node.tag == .MultilineStringLiteral) Space.None else Space.Space;
+        const eq_token = var_decl.getEqToken().?;
-        try renderToken(tree, ais, var_decl.getEqToken().?, s); // =
+        const eq_space = blk: {
+            const loc = tree.tokenLocation(tree.token_locs[eq_token].end, tree.nextToken(eq_token));
+            break :blk if (loc.line == 0) Space.Space else Space.Newline;
+        };
+        {
+            ais.pushIndent();
+            defer ais.popIndent();
+            try renderToken(tree, ais, eq_token, eq_space); // =
+        }
         ais.pushIndentOneShot();
         try renderExpression(allocator, ais, tree, init_node, Space.None);
     }
 @@ -2470,20 +2479,20 @@ fn renderTokenOffset(
     var loc = tree.tokenLocationLoc(token_loc.end, next_token_loc);
     if (loc.line == 0) {
-        try ais.writer().print(" {}", .{mem.trimRight(u8, tree.tokenSliceLoc(next_token_loc), " ")});
+        if (tree.token_ids[token_index] != .MultilineStringLiteralLine) {
+            try ais.writer().writeByte(' ');
+        }
+        try ais.writer().writeAll(mem.trimRight(u8, tree.tokenSliceLoc(next_token_loc), " "));
         offset = 2;
         token_loc = next_token_loc;
         next_token_loc = tree.token_locs[token_index + offset];
         next_token_id = tree.token_ids[token_index + offset];
         if (next_token_id != .LineComment) {
             switch (space) {
-                Space.None, Space.Space => {
+                .None, .Space, .SpaceOrOutdent => {
-                    try ais.insertNewline();
-                },
-                Space.SpaceOrOutdent => {
                     try ais.insertNewline();
                 },
-                Space.Newline => {
+                .Newline => {
                     if (next_token_id == .MultilineStringLiteralLine) {
                         return;
                     } else {
 @@ -2491,8 +2500,8 @@ fn renderTokenOffset(
                         return;
                     }
                 },
-                Space.NoNewline => {},
+                .NoNewline => {},
-                Space.NoComment, Space.Comma, Space.BlockStart => unreachable,
+                .NoComment, .Comma, .BlockStart => unreachable,
             }
             return;
         }
 @@ -2513,7 +2522,7 @@ fn renderTokenOffset(
         next_token_id = tree.token_ids[token_index + offset];
         if (next_token_id != .LineComment) {
             switch (space) {
-                Space.Newline => {
+                .Newline => {
                     if (next_token_id == .MultilineStringLiteralLine) {
                         return;
                     } else {
 @@ -2521,14 +2530,11 @@ fn renderTokenOffset(
                         return;
                     }
                 },
-                Space.None, Space.Space => {
+                .None, .Space, .SpaceOrOutdent => {
-                    try ais.insertNewline();
-                },
-                Space.SpaceOrOutdent => {
                     try ais.insertNewline();
                 },
-                Space.NoNewline => {},
+                .NoNewline => {},
-                Space.NoComment, Space.Comma, Space.BlockStart => unreachable,
+                .NoComment, .Comma, .BlockStart => unreachable,
             }
             return;
         }