authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-05-26 19:32:28-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-05-26 19:32:28-04:00
log349365d9a483bc6be8c1677149ec1a31a789e4b2
tree8b9aa8d6148c8f8a3531dbd8391bae068768a9c2
parentcabf7fa93b7250a69a3cfad417537c2a46414779

zig fmt: better multiline string formatting

3 files changed, 59 insertions(+), 18 deletions(-)

std/zig/parser_test.zig+29
...@@ -1,3 +1,32 @@...@@ -1,3 +1,32 @@
1test "zig fmt: multiline string with backslash at end of line" {
2 try testCanonical(
3 \\comptime {
4 \\ err(
5 \\ \\\
6 \\ );
7 \\}
8 \\
9 );
10}
11
12test "zig fmt: multiline string parameter in fn call with trailing comma" {
13 try testCanonical(
14 \\fn foo() void {
15 \\ try stdout.print(
16 \\ \\ZIG_CMAKE_BINARY_DIR {}
17 \\ \\ZIG_C_HEADER_FILES {}
18 \\ \\ZIG_DIA_GUIDS_LIB {}
19 \\ \\
20 \\ ,
21 \\ std.cstr.toSliceConst(c.ZIG_CMAKE_BINARY_DIR),
22 \\ std.cstr.toSliceConst(c.ZIG_CXX_COMPILER),
23 \\ std.cstr.toSliceConst(c.ZIG_DIA_GUIDS_LIB),
24 \\ );
25 \\}
26 \\
27 );
28}
29
1test "zig fmt: trailing comma on fn call" {30test "zig fmt: trailing comma on fn call" {
2 try testCanonical(31 try testCanonical(
3 \\comptime {32 \\comptime {
std/zig/render.zig+30-6
...@@ -393,15 +393,21 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind...@@ -393,15 +393,21 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
393 var it = call_info.params.iterator(0);393 var it = call_info.params.iterator(0);
394 while (true) {394 while (true) {
395 const param_node = ??it.next();395 const param_node = ??it.next();
396 try stream.writeByteNTimes(' ', new_indent);396
397 const param_node_new_indent = if (param_node.*.id == ast.Node.Id.MultilineStringLiteral) blk: {
398 break :blk indent;
399 } else blk: {
400 try stream.writeByteNTimes(' ', new_indent);
401 break :blk new_indent;
402 };
397403
398 if (it.peek()) |next_node| {404 if (it.peek()) |next_node| {
399 try renderExpression(allocator, stream, tree, new_indent, param_node.*, Space.None);405 try renderExpression(allocator, stream, tree, param_node_new_indent, param_node.*, Space.None);
400 const comma = tree.nextToken(param_node.*.lastToken());406 const comma = tree.nextToken(param_node.*.lastToken());
401 try renderToken(tree, stream, comma, new_indent, Space.Newline); // ,407 try renderToken(tree, stream, comma, new_indent, Space.Newline); // ,
402 try renderExtraNewline(tree, stream, next_node.*);408 try renderExtraNewline(tree, stream, next_node.*);
403 } else {409 } else {
404 try renderTrailingComma(allocator, stream, tree, new_indent, param_node.*, Space.Newline);410 try renderTrailingComma(allocator, stream, tree, param_node_new_indent, param_node.*, Space.Newline);
405 try stream.writeByteNTimes(' ', indent);411 try stream.writeByteNTimes(' ', indent);
406 try renderToken(tree, stream, suffix_op.rtoken, indent, space);412 try renderToken(tree, stream, suffix_op.rtoken, indent, space);
407 return;413 return;
...@@ -1502,7 +1508,13 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent...@@ -1502,7 +1508,13 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
1502 if (next_token.id != Token.Id.LineComment) {1508 if (next_token.id != Token.Id.LineComment) {
1503 switch (space) {1509 switch (space) {
1504 Space.None, Space.NoNewline, Space.NoIndent => return,1510 Space.None, Space.NoNewline, Space.NoIndent => return,
1505 Space.Newline => return stream.write("\n"),1511 Space.Newline => {
1512 if (next_token.id == Token.Id.MultilineStringLiteralLine) {
1513 return;
1514 } else {
1515 return stream.write("\n");
1516 }
1517 },
1506 Space.Space => return stream.writeByte(' '),1518 Space.Space => return stream.writeByte(' '),
1507 Space.NoComment => unreachable,1519 Space.NoComment => unreachable,
1508 }1520 }
...@@ -1526,7 +1538,13 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent...@@ -1526,7 +1538,13 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
1526 };1538 };
1527 try stream.writeByteNTimes(' ', next_line_indent);1539 try stream.writeByteNTimes(' ', next_line_indent);
1528 },1540 },
1529 Space.Newline, Space.NoIndent => try stream.write("\n"),1541 Space.Newline, Space.NoIndent => {
1542 if (next_token.id == Token.Id.MultilineStringLiteralLine) {
1543 return;
1544 } else {
1545 return stream.write("\n");
1546 }
1547 },
1530 Space.NoNewline => {},1548 Space.NoNewline => {},
1531 Space.NoComment => unreachable,1549 Space.NoComment => unreachable,
1532 }1550 }
...@@ -1547,7 +1565,13 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent...@@ -1547,7 +1565,13 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
1547 next_token = tree.tokens.at(token_index + offset);1565 next_token = tree.tokens.at(token_index + offset);
1548 if (next_token.id != Token.Id.LineComment) {1566 if (next_token.id != Token.Id.LineComment) {
1549 switch (space) {1567 switch (space) {
1550 Space.Newline, Space.NoIndent => try stream.writeByte('\n'),1568 Space.Newline, Space.NoIndent => {
1569 if (next_token.id == Token.Id.MultilineStringLiteralLine) {
1570 return;
1571 } else {
1572 return stream.write("\n");
1573 }
1574 },
1551 Space.None, Space.Space => {1575 Space.None, Space.Space => {
1552 try stream.writeByte('\n');1576 try stream.writeByte('\n');
15531577
std/zig/tokenizer.zig-12
...@@ -217,7 +217,6 @@ pub const Tokenizer = struct {...@@ -217,7 +217,6 @@ pub const Tokenizer = struct {
217 StringLiteral,217 StringLiteral,
218 StringLiteralBackslash,218 StringLiteralBackslash,
219 MultilineStringLiteralLine,219 MultilineStringLiteralLine,
220 MultilineStringLiteralLineBackslash,
221 CharLiteral,220 CharLiteral,
222 CharLiteralBackslash,221 CharLiteralBackslash,
223 CharLiteralEscape1,222 CharLiteralEscape1,
...@@ -655,9 +654,6 @@ pub const Tokenizer = struct {...@@ -655,9 +654,6 @@ pub const Tokenizer = struct {
655 },654 },
656655
657 State.MultilineStringLiteralLine => switch (c) {656 State.MultilineStringLiteralLine => switch (c) {
658 '\\' => {
659 state = State.MultilineStringLiteralLineBackslash;
660 },
661 '\n' => {657 '\n' => {
662 self.index += 1;658 self.index += 1;
663 break;659 break;
...@@ -665,13 +661,6 @@ pub const Tokenizer = struct {...@@ -665,13 +661,6 @@ pub const Tokenizer = struct {
665 else => self.checkLiteralCharacter(),661 else => self.checkLiteralCharacter(),
666 },662 },
667663
668 State.MultilineStringLiteralLineBackslash => switch (c) {
669 '\n' => break, // Look for this error later.
670 else => {
671 state = State.MultilineStringLiteralLine;
672 },
673 },
674
675 State.Bang => switch (c) {664 State.Bang => switch (c) {
676 '=' => {665 '=' => {
677 result.id = Token.Id.BangEqual;666 result.id = Token.Id.BangEqual;
...@@ -1010,7 +999,6 @@ pub const Tokenizer = struct {...@@ -1010,7 +999,6 @@ pub const Tokenizer = struct {
1010 State.FloatExponentUnsignedHex,999 State.FloatExponentUnsignedHex,
1011 State.SawAtSign,1000 State.SawAtSign,
1012 State.Backslash,1001 State.Backslash,
1013 State.MultilineStringLiteralLineBackslash,
1014 State.CharLiteral,1002 State.CharLiteral,
1015 State.CharLiteralBackslash,1003 State.CharLiteralBackslash,
1016 State.CharLiteralEscape1,1004 State.CharLiteralEscape1,