Skip to content

Commit e7f8446

Browse files
FuegoFropatrick91
authored andcommitted
Wrap assert correctly (prettier#56)
This diff escapes line breaks used with `assert` and indents the wrapped portions.
1 parent 03b3b81 commit e7f8446

File tree

3 files changed

+49
-4
lines changed

3 files changed

+49
-4
lines changed

src/printer/index.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,13 +1111,20 @@ function genericPrint(path, options, print) {
11111111
}
11121112

11131113
case "Assert": {
1114-
const parts = ["assert", line, path.call(print, "test")];
1114+
const predicate = groupConcat([
1115+
"assert",
1116+
indentConcat([escapedLine, path.call(print, "test")])
1117+
]);
11151118

1116-
if (n.msg) {
1117-
parts.push(",", line, path.call(print, "msg"));
1119+
if (!n.msg) {
1120+
return predicate;
11181121
}
11191122

1120-
return group(concat(parts));
1123+
return groupConcat([
1124+
predicate,
1125+
",",
1126+
indentConcat([escapedLine, path.call(print, "msg")])
1127+
]);
11211128
}
11221129

11231130
case "Yield": {

tests/python_assert/__snapshots__/jsfmt.spec.js.snap

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,49 @@
33
exports[`assert.py 1`] = `
44
assert 3 + 3
55
assert False, 'message'
6+
7+
assert my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
8+
9+
assert my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, "message"
10+
11+
assert predicate, "my_long_message_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
612
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
713
assert 3 + 3
814
assert False, "message"
915
16+
assert \\
17+
my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
18+
19+
assert \\
20+
my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, \\
21+
"message"
22+
23+
assert predicate, \\
24+
"my_long_message_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
25+
1026
`;
1127

1228
exports[`assert.py 2`] = `
1329
assert 3 + 3
1430
assert False, 'message'
31+
32+
assert my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
33+
34+
assert my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, "message"
35+
36+
assert predicate, "my_long_message_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
1537
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1638
assert 3 + 3
1739
assert False, "message"
1840
41+
assert \\
42+
my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
43+
44+
assert \\
45+
my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, \\
46+
"message"
47+
48+
assert predicate, \\
49+
"my_long_message_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
50+
1951
`;

tests/python_assert/assert.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
assert 3 + 3
22
assert False, 'message'
3+
4+
assert my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
5+
6+
assert my_long_predicate_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, "message"
7+
8+
assert predicate, "my_long_message_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"

0 commit comments

Comments
 (0)