Commit 47680cc0d806775dd9576faaff6303e88b14fb5a | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-04-30 15:10:55-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-04-30 15:10:55-04:00
log	47680cc0d806775dd9576faaff6303e88b14fb5a
tree	5f8ae0353a0ced14cf26bb1ff49a0e926f594071
parent	e14db2366160840e0c25f3a467ff984304831e4c

zig fmt: better multiline string handling

2 files changed, 14 insertions(+), 5 deletions(-)

std
- zig
  - parser.zig
  - parser_test.zig

std/zig/parser.zig+3-2

...	@@ -3512,7 +3512,8 @@ pub const Parser = struct {	...	@@ -3512,7 +3512,8 @@ pub const Parser = struct {
3512	try stack.append(RenderState { .Text = ";" });	3512	try stack.append(RenderState { .Text = ";" });
3513	if (var_decl.init_node) \|init_node\| {	3513	if (var_decl.init_node) \|init_node\| {
3514	try stack.append(RenderState { .Expression = init_node });	3514	try stack.append(RenderState { .Expression = init_node });
3515	try stack.append(RenderState { .Text = " = " });	3515	const text = if (init_node.id == ast.Node.Id.MultilineStringLiteral) " =" else " = ";
		3516	try stack.append(RenderState { .Text = text });
3516	}	3517	}
3517	if (var_decl.align_node) \|align_node\| {	3518	if (var_decl.align_node) \|align_node\| {
3518	try stack.append(RenderState { .Text = ")" });	3519	try stack.append(RenderState { .Text = ")" });
...	@@ -4063,7 +4064,7 @@ pub const Parser = struct {	...	@@ -4063,7 +4064,7 @@ pub const Parser = struct {
4063	try stream.writeByteNTimes(' ', indent + indent_delta);	4064	try stream.writeByteNTimes(' ', indent + indent_delta);
4064	try stream.print("{}", self.tokenizer.getTokenSlice(t));	4065	try stream.print("{}", self.tokenizer.getTokenSlice(t));
4065	}	4066	}
4066	try stream.writeByteNTimes(' ', indent + indent_delta);	4067	try stream.writeByteNTimes(' ', indent);
4067	},	4068	},
4068	ast.Node.Id.UndefinedLiteral => {	4069	ast.Node.Id.UndefinedLiteral => {
4069	const undefined_literal = @fieldParentPtr(ast.Node.UndefinedLiteral, "base", base);	4070	const undefined_literal = @fieldParentPtr(ast.Node.UndefinedLiteral, "base", base);

std/zig/parser_test.zig+11-3

 @@ -423,10 +423,18 @@ test "zig fmt: functions" {
 test "zig fmt: multiline string" {
     try testCanonical(
-        \\const s =
+        \\test "" {
-        \\    \\ something
+        \\    const s1 =
-        \\    \\ something else
+        \\        \\one
+        \\        \\two)
+        \\        \\three
+        \\    ;
+        \\    const s2 =
+        \\        c\\one
+        \\        c\\two)
+        \\        c\\three
         \\    ;
+        \\}
         \\
     );
 }