authorgravatar for techatrix@mailbox.orgTechatrix <techatrix@mailbox.org> 2023-01-29 17:37:48+01:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2023-01-30 00:42:05+02:00
log885d6968958e1cad4862ed1b6f1ea0b2d84c3845
treec2a12d3b70b1fd1f77ede7b5e7223d71f4e1dbca
parentd8c3c11c6c5288118b3529c6a99810a4c4add9e9

zig fmt: fix file ending in a multi line comment

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

lib/std/zig/parser_test.zig+9
...@@ -186,6 +186,15 @@ test "zig fmt: file ends in comment" {...@@ -186,6 +186,15 @@ test "zig fmt: file ends in comment" {
186 );186 );
187}187}
188188
189test "zig fmt: file ends in multi line comment" {
190 try testTransform(
191 \\ \\foobar
192 ,
193 \\\\foobar
194 \\
195 );
196}
197
189test "zig fmt: file ends in comment after var decl" {198test "zig fmt: file ends in comment after var decl" {
190 try testTransform(199 try testTransform(
191 \\const x = 42;200 \\const x = 42;
lib/std/zig/render.zig+1-2
...@@ -2759,8 +2759,7 @@ fn tokenSliceForRender(tree: Ast, token_index: Ast.TokenIndex) []const u8 {...@@ -2759,8 +2759,7 @@ fn tokenSliceForRender(tree: Ast, token_index: Ast.TokenIndex) []const u8 {
2759 var ret = tree.tokenSlice(token_index);2759 var ret = tree.tokenSlice(token_index);
2760 switch (tree.tokens.items(.tag)[token_index]) {2760 switch (tree.tokens.items(.tag)[token_index]) {
2761 .multiline_string_literal_line => {2761 .multiline_string_literal_line => {
2762 assert(ret[ret.len - 1] == '\n');2762 if (ret[ret.len - 1] == '\n') ret.len -= 1;
2763 ret.len -= 1;
2764 },2763 },
2765 .container_doc_comment, .doc_comment => {2764 .container_doc_comment, .doc_comment => {
2766 ret = mem.trimRight(u8, ret, &std.ascii.whitespace);2765 ret = mem.trimRight(u8, ret, &std.ascii.whitespace);