Commit 20cfa0b5b62bf712d5aac882f7fde9b8e8cacae3 | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-02-22 17:34:30-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-02-22 17:34:30-07:00
log	20cfa0b5b62bf712d5aac882f7fde9b8e8cacae3
tree	e8d2e4f8055ea86af9788563b5778dfd43117bfe
parent	ec987a7a4652a0dbbd214e0252f35214532a9493

zig fmt: if condition has line break, no fn call comma

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

lib
- std
  - zig
    parser_test.zig
    render.zig

lib/std/zig/parser_test.zig+21-21

...	@@ -1435,27 +1435,27 @@ test "zig fmt: if condition has line break but must not wrap" {	...	@@ -1435,27 +1435,27 @@ test "zig fmt: if condition has line break but must not wrap" {
1435	);	1435	);
1436	}	1436	}
1437		1437
1438	//test "zig fmt: if condition has line break but must not wrap" {	1438	test "zig fmt: if condition has line break but must not wrap (no fn call comma)" {
1439	// try testCanonical(	1439	try testCanonical(
1440	// \\comptime {	1440	\\comptime {
1441	// \\ if (self.user_input_options.put(name, UserInputOption{	1441	\\ if (self.user_input_options.put(name, UserInputOption{
1442	// \\ .name = name,	1442	\\ .name = name,
1443	// \\ .used = false,	1443	\\ .used = false,
1444	// \\ }) catch unreachable) \|*prev_value\| {	1444	\\ }) catch unreachable) \|*prev_value\| {
1445	// \\ foo();	1445	\\ foo();
1446	// \\ bar();	1446	\\ bar();
1447	// \\ }	1447	\\ }
1448	// \\ if (put(	1448	\\ if (put(
1449	// \\ a,	1449	\\ a,
1450	// \\ b,	1450	\\ b,
1451	// \\ )) {	1451	\\ )) {
1452	// \\ foo();	1452	\\ foo();
1453	// \\ }	1453	\\ }
1454	// \\}	1454	\\}
1455	// \\	1455	\\
1456	// );	1456	);
1457	//}	1457	}
1458	//	1458
1459	//test "zig fmt: function call with multiline argument" {	1459	//test "zig fmt: function call with multiline argument" {
1460	// try testCanonical(	1460	// try testCanonical(
1461	// \\comptime {	1461	// \\comptime {

lib/std/zig/render.zig+13-15

 @@ -1903,28 +1903,23 @@ fn renderCall(
         return renderToken(ais, tree, after_last_param_tok + 1, space); // )
     }
-    ais.pushIndentNextLine();
     try renderToken(ais, tree, lparen, .none); // (
     for (params) |param_node, i| {
+        const this_multiline_string = node_tags[param_node] == .multiline_string_literal;
+        if (this_multiline_string) {
+            ais.pushIndentOneShot();
+        }
         try renderExpression(ais, tree, param_node, .none);
         if (i + 1 < params.len) {
             const comma = tree.lastToken(param_node) + 1;
-            const this_multiline_string = node_tags[param_node] == .multiline_string_literal;
             const next_multiline_string = node_tags[params[i + 1]] == .multiline_string_literal;
             const comma_space: Space = if (next_multiline_string) .none else .space;
-            if (this_multiline_string) {
+            try renderToken(ais, tree, comma, comma_space);
-                ais.popIndent();
-                try renderToken(ais, tree, comma, comma_space);
-                ais.pushIndent();
-            } else {
-                try renderToken(ais, tree, comma, comma_space);
-            }
         }
     }
-    ais.popIndent();
     return renderToken(ais, tree, after_last_param_tok, space); // )
 }
 @@ -2234,9 +2229,12 @@ fn AutoIndentingStream(comptime UnderlyingWriter: type) type {
         indent_count: usize = 0,
         indent_delta: usize,
         current_line_empty: bool = true,
-        indent_one_shot_count: usize = 0, // automatically popped when applied
+        /// automatically popped when applied
-        applied_indent: usize = 0, // the most recently applied indent
+        indent_one_shot_count: usize = 0,
-        indent_next_line: usize = 0, // not used until the next line
+        /// the most recently applied indent
+        applied_indent: usize = 0,
+        /// not used until the next line
+        indent_next_line: usize = 0,
         pub fn writer(self: *Self) Writer {
             return .{ .context = self };
 @@ -2291,9 +2289,9 @@ fn AutoIndentingStream(comptime UnderlyingWriter: type) type {
         }
         /// Push default indentation
+        /// Doesn't actually write any indentation.
+        /// Just primes the stream to be able to write the correct indentation if it needs to.
         pub fn pushIndent(self: *Self) void {
-            // Doesn't actually write any indentation.
-            // Just primes the stream to be able to write the correct indentation if it needs to.
             self.indent_count += 1;
         }