authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-05-26 18:44:10-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-05-26 18:44:10-04:00
logcabf7fa93b7250a69a3cfad417537c2a46414779
tree4de09db41ba3f5bc5c3b48c0c97f96d7b59872ac
parentb8d4e05361d6a01ae1c0bf931e27e2bfdb25551d

zig fmt: fn calls with trailing comma with params on new lines

2 files changed, 49 insertions(+), 2 deletions(-)

std/zig/parser_test.zig+13
...@@ -1,3 +1,16 @@...@@ -1,3 +1,16 @@
1test "zig fmt: trailing comma on fn call" {
2 try testCanonical(
3 \\comptime {
4 \\ var module = try Module.create(
5 \\ allocator,
6 \\ zig_lib_dir,
7 \\ full_cache_dir,
8 \\ );
9 \\}
10 \\
11 );
12}
13
1test "zig fmt: empty block with only comment" {14test "zig fmt: empty block with only comment" {
2 try testCanonical(15 try testCanonical(
3 \\comptime {16 \\comptime {
std/zig/render.zig+36-2
...@@ -374,7 +374,42 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind...@@ -374,7 +374,42 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
374 try renderExpression(allocator, stream, tree, indent, suffix_op.lhs, Space.None);374 try renderExpression(allocator, stream, tree, indent, suffix_op.lhs, Space.None);
375375
376 const lparen = tree.nextToken(suffix_op.lhs.lastToken());376 const lparen = tree.nextToken(suffix_op.lhs.lastToken());
377 try renderToken(tree, stream, lparen, indent, Space.None);377
378 if (call_info.params.len == 0) {
379 try renderToken(tree, stream, lparen, indent, Space.None);
380 try renderToken(tree, stream, suffix_op.rtoken, indent, space);
381 return;
382 }
383
384 const src_has_trailing_comma = blk: {
385 const maybe_comma = tree.prevToken(suffix_op.rtoken);
386 break :blk tree.tokens.at(maybe_comma).id == Token.Id.Comma;
387 };
388
389 if (src_has_trailing_comma) {
390 const new_indent = indent + indent_delta;
391 try renderToken(tree, stream, lparen, new_indent, Space.Newline);
392
393 var it = call_info.params.iterator(0);
394 while (true) {
395 const param_node = ??it.next();
396 try stream.writeByteNTimes(' ', new_indent);
397
398 if (it.peek()) |next_node| {
399 try renderExpression(allocator, stream, tree, new_indent, param_node.*, Space.None);
400 const comma = tree.nextToken(param_node.*.lastToken());
401 try renderToken(tree, stream, comma, new_indent, Space.Newline); // ,
402 try renderExtraNewline(tree, stream, next_node.*);
403 } else {
404 try renderTrailingComma(allocator, stream, tree, new_indent, param_node.*, Space.Newline);
405 try stream.writeByteNTimes(' ', indent);
406 try renderToken(tree, stream, suffix_op.rtoken, indent, space);
407 return;
408 }
409 }
410 }
411
412 try renderToken(tree, stream, lparen, indent, Space.None); // (
378413
379 var it = call_info.params.iterator(0);414 var it = call_info.params.iterator(0);
380 while (it.next()) |param_node| {415 while (it.next()) |param_node| {
...@@ -385,7 +420,6 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind...@@ -385,7 +420,6 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
385 try renderToken(tree, stream, comma, indent, Space.Space);420 try renderToken(tree, stream, comma, indent, Space.Space);
386 }421 }
387 }422 }
388
389 try renderToken(tree, stream, suffix_op.rtoken, indent, space);423 try renderToken(tree, stream, suffix_op.rtoken, indent, space);
390 },424 },
391425