mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 12:59:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig fmt: handle comments in array type/init/access

Browse Source
This commit is contained in:
Isaac Freund 2021-02-23 19:56:56 +01:00
parent abfe213830
commit b028a92a60
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lib/std/zig/parser_test.zig
View File

@ -3521,37 +3521,41 @@ test "zig fmt: comment after params" {
);
}
//test "zig fmt: comment in array initializer/access" {
// try testCanonical(
// \\test "a" {
// \\ var a = x{ //aa
// \\ //bb
// \\ };
// \\ var a = []x{ //aa
// \\ //bb
// \\ };
// \\ var b = [ //aa
// \\ _
// \\ ]x{ //aa
// \\ //bb
// \\ 9,
// \\ };
// \\ var c = b[ //aa
// \\ 0
// \\ ];
// \\ var d = [_
// \\ //aa
// \\ ]x{ //aa
// \\ //bb
// \\ 9,
// \\ };
// \\ var e = d[0
// \\ //aa
// \\ ];
// \\}
// \\
// );
//}
test "zig fmt: comment in array initializer/access" {
try testCanonical(
\\test "a" {
\\ var a = x{ //aa
\\ //bb
\\ };
\\ var a = []x{ //aa
\\ //bb
\\ };
\\ var b = [ //aa
\\ _
\\ ]x{ //aa
\\ //bb
\\ 9,
\\ };
\\ var c = b[ //aa
\\ 0
\\ ];
\\ var d = [
\\ _
\\ //aa
\\ :
\\ 0
\\ ]x{ //aa
\\ //bb
\\ 9,
\\ };
\\ var e = d[
\\ 0
\\ //aa
\\ ];
\\}
\\
);
}
test "zig fmt: comments at several places in struct init" {
try testTransform(

26
lib/std/zig/render.zig
View File

@ -439,9 +439,13 @@ fn renderExpression(gpa: *Allocator, ais: *Ais, tree: ast.Tree, node: ast.Node.I
const suffix = datas[node];
const lbracket = tree.firstToken(suffix.rhs) - 1;
const rbracket = tree.lastToken(suffix.rhs) + 1;
const one_line = tree.tokensOnSameLine(lbracket, rbracket);
const inner_space = if (one_line) Space.none else Space.newline;
try renderExpression(gpa, ais, tree, suffix.lhs, .none);
try renderToken(ais, tree, lbracket, .none); // [
try renderExpression(gpa, ais, tree, suffix.rhs, .none);
ais.pushIndentNextLine();
try renderToken(ais, tree, lbracket, inner_space); // [
try renderExpression(gpa, ais, tree, suffix.rhs, inner_space);
ais.popIndent();
return renderToken(ais, tree, rbracket, space); // ]
},
@ -679,7 +683,6 @@ fn renderExpression(gpa: *Allocator, ais: *Ais, tree: ast.Tree, node: ast.Node.I
}
}
// TODO: handle comments inside the brackets
fn renderArrayType(
gpa: *Allocator,
ais: *Ais,
@ -687,13 +690,18 @@ fn renderArrayType(
array_type: ast.full.ArrayType,
space: Space,
) Error!void {
try renderToken(ais, tree, array_type.ast.lbracket, .none); // lbracket
try renderExpression(gpa, ais, tree, array_type.ast.elem_count, .none);
const rbracket = tree.firstToken(array_type.ast.elem_type) - 1;
const one_line = tree.tokensOnSameLine(array_type.ast.lbracket, rbracket);
const inner_space = if (one_line) Space.none else Space.newline;
ais.pushIndentNextLine();
try renderToken(ais, tree, array_type.ast.lbracket, inner_space); // lbracket
try renderExpression(gpa, ais, tree, array_type.ast.elem_count, inner_space);
if (array_type.ast.sentinel) |sentinel| {
try renderToken(ais, tree, tree.firstToken(sentinel) - 1, .none); // colon
try renderExpression(gpa, ais, tree, sentinel, .none);
try renderToken(ais, tree, tree.firstToken(sentinel) - 1, inner_space); // colon
try renderExpression(gpa, ais, tree, sentinel, inner_space);
}
try renderToken(ais, tree, tree.firstToken(array_type.ast.elem_type) - 1, .none); // rbracket
ais.popIndent();
try renderToken(ais, tree, rbracket, .none); // rbracket
return renderExpression(gpa, ais, tree, array_type.ast.elem_type, space);
}
@ -1577,7 +1585,9 @@ fn renderStructInit(
try renderExpression(gpa, ais, tree, struct_init.ast.type_expr, .none); // T
}
if (struct_init.ast.fields.len == 0) {
ais.pushIndentNextLine();
try renderToken(ais, tree, struct_init.ast.lbrace, .none); // lbrace
ais.popIndent();
return renderToken(ais, tree, struct_init.ast.lbrace + 1, space); // rbrace
}