authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-02-22 17:55:19-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-02-22 17:55:19-07:00
logfec51ad7c5fe5f141f8f0c53a1287c5a00613429
tree7c9e33de6ed01338c0bc4c7e6c5cd4e018f09ec1
parent20cfa0b5b62bf712d5aac882f7fde9b8e8cacae3

zig fmt: while

3 files changed, 121 insertions(+), 97 deletions(-)

lib/std/zig/ast.zig+9-4
...@@ -587,11 +587,16 @@ pub const Tree = struct {...@@ -587,11 +587,16 @@ pub const Tree = struct {
587 .for_simple,587 .for_simple,
588 .@"for",588 .@"for",
589 => {589 => {
590 // Look for a label and inline.
590 const main_token = main_tokens[n];591 const main_token = main_tokens[n];
591 return switch (token_tags[main_token - 1]) {592 var result = main_token;
592 .keyword_inline => main_token - 1,593 if (token_tags[result - 1] == .keyword_inline) {
593 else => main_token,594 result -= 1;
594 } - end_offset;595 }
596 if (token_tags[result - 1] == .colon) {
597 result -= 2;
598 }
599 return result - end_offset;
595 },600 },
596 };601 };
597 }602 }
lib/std/zig/parser_test.zig+98-88
...@@ -1456,17 +1456,17 @@ test "zig fmt: if condition has line break but must not wrap (no fn call comma)"...@@ -1456,17 +1456,17 @@ test "zig fmt: if condition has line break but must not wrap (no fn call comma)"
1456 );1456 );
1457}1457}
14581458
1459//test "zig fmt: function call with multiline argument" {1459test "zig fmt: function call with multiline argument" {
1460// try testCanonical(1460 try testCanonical(
1461// \\comptime {1461 \\comptime {
1462// \\ self.user_input_options.put(name, UserInputOption{1462 \\ self.user_input_options.put(name, UserInputOption{
1463// \\ .name = name,1463 \\ .name = name,
1464// \\ .used = false,1464 \\ .used = false,
1465// \\ });1465 \\ });
1466// \\}1466 \\}
1467// \\1467 \\
1468// );1468 );
1469//}1469}
14701470
1471test "zig fmt: if-else with comment before else" {1471test "zig fmt: if-else with comment before else" {
1472 try testCanonical(1472 try testCanonical(
...@@ -1817,14 +1817,24 @@ test "zig fmt: empty block with only comment" {...@@ -1817,14 +1817,24 @@ test "zig fmt: empty block with only comment" {
1817 );1817 );
1818}1818}
18191819
1820//test "zig fmt: no trailing comma on struct decl" {1820test "zig fmt: trailing commas on struct decl" {
1821// try testCanonical(1821 try testTransform(
1822// \\const RoundParam = struct {1822 \\const RoundParam = struct {
1823// \\ k: usize, s: u32, t: u321823 \\ k: usize, s: u32, t: u32
1824// \\};1824 \\};
1825// \\1825 \\const RoundParam = struct {
1826// );1826 \\ k: usize, s: u32, t: u32,
1827//}1827 \\};
1828 ,
1829 \\const RoundParam = struct { k: usize, s: u32, t: u32 };
1830 \\const RoundParam = struct {
1831 \\ k: usize,
1832 \\ s: u32,
1833 \\ t: u32,
1834 \\};
1835 \\
1836 );
1837}
18281838
1829test "zig fmt: extra newlines at the end" {1839test "zig fmt: extra newlines at the end" {
1830 try testTransform(1840 try testTransform(
...@@ -2975,75 +2985,75 @@ test "zig fmt: switch" {...@@ -2975,75 +2985,75 @@ test "zig fmt: switch" {
2975 );2985 );
2976}2986}
29772987
2978//test "zig fmt: while" {2988test "zig fmt: while" {
2979// try testCanonical(2989 try testCanonical(
2980// \\test "while" {2990 \\test "while" {
2981// \\ while (10 < 1) unreachable;2991 \\ while (10 < 1) unreachable;
2982// \\2992 \\
2983// \\ while (10 < 1) unreachable else unreachable;2993 \\ while (10 < 1) unreachable else unreachable;
2984// \\2994 \\
2985// \\ while (10 < 1) {2995 \\ while (10 < 1) {
2986// \\ unreachable;2996 \\ unreachable;
2987// \\ }2997 \\ }
2988// \\2998 \\
2989// \\ while (10 < 1)2999 \\ while (10 < 1)
2990// \\ unreachable;3000 \\ unreachable;
2991// \\3001 \\
2992// \\ var i: usize = 0;3002 \\ var i: usize = 0;
2993// \\ while (i < 10) : (i += 1) {3003 \\ while (i < 10) : (i += 1) {
2994// \\ continue;3004 \\ continue;
2995// \\ }3005 \\ }
2996// \\3006 \\
2997// \\ i = 0;3007 \\ i = 0;
2998// \\ while (i < 10) : (i += 1)3008 \\ while (i < 10) : (i += 1)
2999// \\ continue;3009 \\ continue;
3000// \\3010 \\
3001// \\ i = 0;3011 \\ i = 0;
3002// \\ var j: usize = 0;3012 \\ var j: usize = 0;
3003// \\ while (i < 10) : ({3013 \\ while (i < 10) : ({
3004// \\ i += 1;3014 \\ i += 1;
3005// \\ j += 1;3015 \\ j += 1;
3006// \\ }) {3016 \\ }) {
3007// \\ continue;3017 \\ continue;
3008// \\ }3018 \\ }
3009// \\3019 \\
3010// \\ var a: ?u8 = 2;3020 \\ var a: ?u8 = 2;
3011// \\ while (a) |v| : (a = null) {3021 \\ while (a) |v| : (a = null) {
3012// \\ continue;3022 \\ continue;
3013// \\ }3023 \\ }
3014// \\3024 \\
3015// \\ while (a) |v| : (a = null)3025 \\ while (a) |v| : (a = null)
3016// \\ unreachable;3026 \\ unreachable;
3017// \\3027 \\
3018// \\ label: while (10 < 0) {3028 \\ label: while (10 < 0) {
3019// \\ unreachable;3029 \\ unreachable;
3020// \\ }3030 \\ }
3021// \\3031 \\
3022// \\ const res = while (0 < 10) {3032 \\ const res = while (0 < 10) {
3023// \\ break 7;3033 \\ break 7;
3024// \\ } else {3034 \\ } else {
3025// \\ unreachable;3035 \\ unreachable;
3026// \\ };3036 \\ };
3027// \\3037 \\
3028// \\ const res = while (0 < 10)3038 \\ const res = while (0 < 10)
3029// \\ break 73039 \\ break 7
3030// \\ else3040 \\ else
3031// \\ unreachable;3041 \\ unreachable;
3032// \\3042 \\
3033// \\ var a: anyerror!u8 = 0;3043 \\ var a: anyerror!u8 = 0;
3034// \\ while (a) |v| {3044 \\ while (a) |v| {
3035// \\ a = error.Err;3045 \\ a = error.Err;
3036// \\ } else |err| {3046 \\ } else |err| {
3037// \\ i = 1;3047 \\ i = 1;
3038// \\ }3048 \\ }
3039// \\3049 \\
3040// \\ comptime var k: usize = 0;3050 \\ comptime var k: usize = 0;
3041// \\ inline while (i < 10) : (i += 1)3051 \\ inline while (i < 10) : (i += 1)
3042// \\ j += 2;3052 \\ j += 2;
3043// \\}3053 \\}
3044// \\3054 \\
3045// );3055 );
3046//}3056}
30473057
3048test "zig fmt: for" {3058test "zig fmt: for" {
3049 try testCanonical(3059 try testCanonical(
lib/std/zig/render.zig+14-5
...@@ -1006,11 +1006,17 @@ fn renderWhile(ais: *Ais, tree: ast.Tree, while_node: ast.full.While, space: Spa...@@ -1006,11 +1006,17 @@ fn renderWhile(ais: *Ais, tree: ast.Tree, while_node: ast.full.While, space: Spa
1006 break :blk ident + 1;1006 break :blk ident + 1;
1007 }1007 }
1008 };1008 };
1009 const brace_space: Space = if (ais.isLineOverIndented()) .newline else .space;1009 const brace_space = if (while_node.ast.cont_expr == 0 and ais.isLineOverIndented())
1010 Space.newline
1011 else
1012 Space.space;
1010 try renderToken(ais, tree, pipe, brace_space); // |1013 try renderToken(ais, tree, pipe, brace_space); // |
1011 } else {1014 } else {
1012 const rparen = tree.lastToken(while_node.ast.cond_expr) + 1;1015 const rparen = tree.lastToken(while_node.ast.cond_expr) + 1;
1013 const brace_space: Space = if (ais.isLineOverIndented()) .newline else .space;1016 const brace_space = if (while_node.ast.cont_expr == 0 and ais.isLineOverIndented())
1017 Space.newline
1018 else
1019 Space.space;
1014 try renderToken(ais, tree, rparen, brace_space); // rparen1020 try renderToken(ais, tree, rparen, brace_space); // rparen
1015 }1021 }
1016 if (while_node.ast.cont_expr != 0) {1022 if (while_node.ast.cont_expr != 0) {
...@@ -1019,7 +1025,8 @@ fn renderWhile(ais: *Ais, tree: ast.Tree, while_node: ast.full.While, space: Spa...@@ -1019,7 +1025,8 @@ fn renderWhile(ais: *Ais, tree: ast.Tree, while_node: ast.full.While, space: Spa
1019 try renderToken(ais, tree, lparen - 1, .space); // :1025 try renderToken(ais, tree, lparen - 1, .space); // :
1020 try renderToken(ais, tree, lparen, .none); // lparen1026 try renderToken(ais, tree, lparen, .none); // lparen
1021 try renderExpression(ais, tree, while_node.ast.cont_expr, .none);1027 try renderExpression(ais, tree, while_node.ast.cont_expr, .none);
1022 try renderToken(ais, tree, rparen, .space); // rparen1028 const brace_space: Space = if (ais.isLineOverIndented()) .newline else .space;
1029 try renderToken(ais, tree, rparen, brace_space); // rparen
1023 }1030 }
1024 if (while_node.ast.else_expr != 0) {1031 if (while_node.ast.else_expr != 0) {
1025 try renderExpression(ais, tree, while_node.ast.then_expr, Space.space);1032 try renderExpression(ais, tree, while_node.ast.then_expr, Space.space);
...@@ -1061,10 +1068,12 @@ fn renderWhile(ais: *Ais, tree: ast.Tree, while_node: ast.full.While, space: Spa...@@ -1061,10 +1068,12 @@ fn renderWhile(ais: *Ais, tree: ast.Tree, while_node: ast.full.While, space: Spa
1061 break :blk ident + 1;1068 break :blk ident + 1;
1062 }1069 }
1063 };1070 };
1064 try renderToken(ais, tree, pipe, .newline); // |1071 const after_space: Space = if (while_node.ast.cont_expr != 0) .space else .newline;
1072 try renderToken(ais, tree, pipe, after_space); // |
1065 } else {1073 } else {
1066 ais.pushIndent();1074 ais.pushIndent();
1067 try renderToken(ais, tree, rparen, .newline); // rparen1075 const after_space: Space = if (while_node.ast.cont_expr != 0) .space else .newline;
1076 try renderToken(ais, tree, rparen, after_space); // rparen
1068 ais.popIndent();1077 ais.popIndent();
1069 }1078 }
1070 if (while_node.ast.cont_expr != 0) {1079 if (while_node.ast.cont_expr != 0) {