Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zig fmt: if-else with comment before else

master
Andrew Kelley 2018-05-28 22:41:05 -04:00
parent 77ec81b035
commit 0d1b47362c
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
std/zig/parser_test.zig
View File

@ -1,3 +1,21 @@
test "zig fmt: if-else with comment before else" {
try testCanonical(
\\comptime {
\\ // cexp(finite|nan +- i inf|nan) = nan + i nan
\\ if ((hx & 0x7fffffff) != 0x7f800000) {
\\ return Complex(f32).new(y - y, y - y);
\\ } // cexp(-inf +- i inf|nan) = 0 + i0
\\ else if (hx & 0x80000000 != 0) {
\\ return Complex(f32).new(0, 0);
\\ } // cexp(+inf +- i inf|nan) = inf + i nan
\\ else {
\\ return Complex(f32).new(x, y - y);
\\ }
\\}
\\
);
}
test "zig fmt: respect line breaks in if-else" { test "zig fmt: respect line breaks in if-else" {
try testCanonical( try testCanonical(
\\comptime { \\comptime {

20
std/zig/render.zig
View File

@ -1341,7 +1341,7 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
} }
if (if_node.@"else") |@"else"| { if (if_node.@"else") |@"else"| {
try renderExpression(allocator, stream, tree, indent, if_node.body, Space.Space); try renderExpression(allocator, stream, tree, indent, if_node.body, Space.SpaceOrOutdent);
return renderExpression(allocator, stream, tree, indent, &@"else".base, space); return renderExpression(allocator, stream, tree, indent, &@"else".base, space);
} else { } else {
return renderExpression(allocator, stream, tree, indent, if_node.body, space); return renderExpression(allocator, stream, tree, indent, if_node.body, space);
@ -1685,8 +1685,8 @@ const Space = enum {
Newline, Newline,
Comma, Comma,
Space, Space,
SpaceOrOutdent,
NoNewline, NoNewline,
NoIndent,
NoComment, NoComment,
}; };
@ -1717,7 +1717,7 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
if (next_token.id != Token.Id.LineComment) { if (next_token.id != Token.Id.LineComment) {
switch (space) { switch (space) {
Space.None, Space.NoNewline, Space.NoIndent => return, Space.None, Space.NoNewline => return,
Space.Newline => { Space.Newline => {
if (next_token.id == Token.Id.MultilineStringLiteralLine) { if (next_token.id == Token.Id.MultilineStringLiteralLine) {
return; return;
@ -1725,7 +1725,7 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
return stream.write("\n"); return stream.write("\n");
} }
}, },
Space.Space => return stream.writeByte(' '), Space.Space, Space.SpaceOrOutdent => return stream.writeByte(' '),
Space.NoComment, Space.Comma => unreachable, Space.NoComment, Space.Comma => unreachable,
} }
} }
@ -1756,7 +1756,11 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
}; };
try stream.writeByteNTimes(' ', next_line_indent); try stream.writeByteNTimes(' ', next_line_indent);
}, },
Space.Newline, Space.NoIndent => { Space.SpaceOrOutdent => {
try stream.writeByte('\n');
try stream.writeByteNTimes(' ', indent);
},
Space.Newline => {
if (next_token.id == Token.Id.MultilineStringLiteralLine) { if (next_token.id == Token.Id.MultilineStringLiteralLine) {
return; return;
} else { } else {
@ -1783,7 +1787,7 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
next_token = tree.tokens.at(token_index + offset); next_token = tree.tokens.at(token_index + offset);
if (next_token.id != Token.Id.LineComment) { if (next_token.id != Token.Id.LineComment) {
switch (space) { switch (space) {
Space.Newline, Space.NoIndent => { Space.Newline => {
if (next_token.id == Token.Id.MultilineStringLiteralLine) { if (next_token.id == Token.Id.MultilineStringLiteralLine) {
return; return;
} else { } else {
@ -1800,6 +1804,10 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
}; };
try stream.writeByteNTimes(' ', next_line_indent); try stream.writeByteNTimes(' ', next_line_indent);
}, },
Space.SpaceOrOutdent => {
try stream.writeByte('\n');
try stream.writeByteNTimes(' ', indent);
},
Space.NoNewline => {}, Space.NoNewline => {},
Space.NoComment, Space.Comma => unreachable, Space.NoComment, Space.Comma => unreachable,
} }