authorgravatar for mail@isaacfreund.comIsaac Freund <mail@isaacfreund.com> 2021-02-23 19:17:11+01:00
committergravatar for mail@isaacfreund.comIsaac Freund <mail@isaacfreund.com> 2021-02-23 19:17:11+01:00
log0f24b61ed543ad4879c5f9ef607bd856ce016f75
tree985d39d41f4dfe8612c02f473b58cb07e130650d
parent5820bd0e64ce58cca045a5dfe5ba03d9979eece8
signaturelock-open Commit is signed but in an unrecognized format.

zig fmt: insert trailing comma in struct init with comment

2 files changed, 37 insertions(+), 36 deletions(-)

lib/std/zig/parser_test.zig+26-25
......@@ -3552,31 +3552,32 @@ test "zig fmt: comment after params" {
35523552// );
35533553//}
35543554
3555//test "zig fmt: comments at several places in struct init" {
3556// try testTransform(
3557// \\var bar = Bar{
3558// \\ .x = 10, // test
3559// \\ .y = "test"
3560// \\ // test
3561// \\};
3562// \\
3563// ,
3564// \\var bar = Bar{
3565// \\ .x = 10, // test
3566// \\ .y = "test", // test
3567// \\};
3568// \\
3569// );
3570//
3571// try testCanonical(
3572// \\var bar = Bar{ // test
3573// \\ .x = 10, // test
3574// \\ .y = "test",
3575// \\ // test
3576// \\};
3577// \\
3578// );
3579//}
3555test "zig fmt: comments at several places in struct init" {
3556 try testTransform(
3557 \\var bar = Bar{
3558 \\ .x = 10, // test
3559 \\ .y = "test"
3560 \\ // test
3561 \\};
3562 \\
3563 ,
3564 \\var bar = Bar{
3565 \\ .x = 10, // test
3566 \\ .y = "test",
3567 \\ // test
3568 \\};
3569 \\
3570 );
3571
3572 try testCanonical(
3573 \\var bar = Bar{ // test
3574 \\ .x = 10, // test
3575 \\ .y = "test",
3576 \\ // test
3577 \\};
3578 \\
3579 );
3580}
35803581
35813582test "zig fmt: container doc comments" {
35823583 try testCanonical(
lib/std/zig/render.zig+11-11
......@@ -411,18 +411,18 @@ fn renderExpression(gpa: *Allocator, ais: *Ais, tree: ast.Tree, node: ast.Node.I
411411
412412 .struct_init_one, .struct_init_one_comma => {
413413 var fields: [1]ast.Node.Index = undefined;
414 return renderStructInit(gpa, ais, tree, tree.structInitOne(&fields, node), space);
414 return renderStructInit(gpa, ais, tree, node, tree.structInitOne(&fields, node), space);
415415 },
416416 .struct_init_dot_two, .struct_init_dot_two_comma => {
417417 var fields: [2]ast.Node.Index = undefined;
418 return renderStructInit(gpa, ais, tree, tree.structInitDotTwo(&fields, node), space);
418 return renderStructInit(gpa, ais, tree, node, tree.structInitDotTwo(&fields, node), space);
419419 },
420420 .struct_init_dot,
421421 .struct_init_dot_comma,
422 => return renderStructInit(gpa, ais, tree, tree.structInitDot(node), space),
422 => return renderStructInit(gpa, ais, tree, node, tree.structInitDot(node), space),
423423 .struct_init,
424424 .struct_init_comma,
425 => return renderStructInit(gpa, ais, tree, tree.structInit(node), space),
425 => return renderStructInit(gpa, ais, tree, node, tree.structInit(node), space),
426426
427427 .call_one, .call_one_comma, .async_call_one, .async_call_one_comma => {
428428 var params: [1]ast.Node.Index = undefined;
......@@ -1564,11 +1564,11 @@ fn renderBlock(
15641564 try renderToken(ais, tree, tree.lastToken(block_node), space); // rbrace
15651565}
15661566
1567// TODO: handle comments between fields
15681567fn renderStructInit(
15691568 gpa: *Allocator,
15701569 ais: *Ais,
15711570 tree: ast.Tree,
1571 struct_node: ast.Node.Index,
15721572 struct_init: ast.full.StructInit,
15731573 space: Space,
15741574) Error!void {
......@@ -1582,9 +1582,10 @@ fn renderStructInit(
15821582 try renderToken(ais, tree, struct_init.ast.lbrace, .none); // lbrace
15831583 return renderToken(ais, tree, struct_init.ast.lbrace + 1, space); // rbrace
15841584 }
1585 const last_field = struct_init.ast.fields[struct_init.ast.fields.len - 1];
1586 const last_field_token = tree.lastToken(last_field);
1587 if (token_tags[last_field_token + 1] == .comma) {
1585
1586 const rbrace = tree.lastToken(struct_node);
1587 const trailing_comma = token_tags[rbrace - 1] == .comma;
1588 if (trailing_comma or hasComment(tree, struct_init.ast.lbrace, rbrace)) {
15881589 // Render one field init per line.
15891590 ais.pushIndentNextLine();
15901591 try renderToken(ais, tree, struct_init.ast.lbrace, .newline);
......@@ -1604,7 +1605,6 @@ fn renderStructInit(
16041605 }
16051606
16061607 ais.popIndent();
1607 return renderToken(ais, tree, last_field_token + 2, space); // rbrace
16081608 } else {
16091609 // Render all on one line, no trailing comma.
16101610 try renderToken(ais, tree, struct_init.ast.lbrace, .space);
......@@ -1616,9 +1616,9 @@ fn renderStructInit(
16161616 try renderToken(ais, tree, init_token - 1, .space); // =
16171617 try renderExpression(gpa, ais, tree, field_init, .comma_space);
16181618 }
1619
1620 return renderToken(ais, tree, last_field_token + 1, space); // rbrace
16211619 }
1620
1621 return renderToken(ais, tree, rbrace, space);
16221622}
16231623
16241624// TODO: handle comments between elements