jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-12-04 02:48:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

handle more cases of inserting trailing commas

Browse Source
This commit is contained in:
Andrew Kelley 2018-05-25 01:52:59 -04:00
parent 000c01a36a
commit 3f302f8411
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
std/zig/render.zig
View File

@ -449,13 +449,16 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
var it = field_inits.iterator(0);
while (it.next()) |field_init| {
try stream.writeByteNTimes(' ', new_indent);
try renderExpression(allocator, stream, tree, new_indent, field_init.*, Space.None);
const comma = tree.nextToken(field_init.*.lastToken());
try renderToken(tree, stream, comma, new_indent, Space.Newline);
if (it.peek()) |next_field_init| {
try renderExpression(allocator, stream, tree, new_indent, field_init.*, Space.None);
const comma = tree.nextToken(field_init.*.lastToken());
try renderToken(tree, stream, comma, new_indent, Space.Newline);
try renderExtraNewline(tree, stream, next_field_init.*);
} else {
try renderTrailingComma(allocator, stream, tree, new_indent, field_init.*, Space.Newline);
}
}
@ -499,7 +502,7 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
try renderExtraNewline(tree, stream, next_expr.*);
} else {
try renderTrailingComma(allocator, stream, tree, indent, expr.*, Space.Newline);
try renderTrailingComma(allocator, stream, tree, new_indent, expr.*, Space.Newline);
}
}
@ -743,11 +746,14 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
var it = err_set_decl.decls.iterator(0);
while (it.next()) |node| {
try stream.writeByteNTimes(' ', new_indent);
try renderExpression(allocator, stream, tree, new_indent, node.*, Space.None);
try renderToken(tree, stream, tree.nextToken(node.*.lastToken()), new_indent, Space.Newline); // ,
if (it.peek()) |next_node| {
try renderExpression(allocator, stream, tree, new_indent, node.*, Space.None);
try renderToken(tree, stream, tree.nextToken(node.*.lastToken()), new_indent, Space.Newline); // ,
try renderExtraNewline(tree, stream, next_node.*);
} else {
try renderTrailingComma(allocator, stream, tree, new_indent, node.*, Space.Newline);
}
}