mirror of
https://github.com/astral-sh/ruff.git
synced 2025-08-04 02:39:12 +00:00
Update formatter fixtures (#8935)
I merged a branch that wasn't up-to-date, which left us with test failures on `main`.
This commit is contained in:
Charlie Marsh
GitHub
parent
eaa310429f
commit
b2638c62a5
2 changed files with 330 additions and 587 deletions
|
|
@ -197,94 +197,7 @@ for foo in ["a", "b"]:
|
|||
```diff
|
||||
--- Black
|
||||
+++ Ruff
|
||||
@@ -1,43 +1,55 @@
|
||||
def foo_brackets(request):
|
||||
- return JsonResponse({
|
||||
- "var_1": foo,
|
||||
- "var_2": bar,
|
||||
- })
|
||||
+ return JsonResponse(
|
||||
+ {
|
||||
+ "var_1": foo,
|
||||
+ "var_2": bar,
|
||||
+ }
|
||||
+ )
|
||||
|
||||
|
||||
def foo_square_brackets(request):
|
||||
- return JsonResponse([
|
||||
- "var_1",
|
||||
- "var_2",
|
||||
- ])
|
||||
+ return JsonResponse(
|
||||
+ [
|
||||
+ "var_1",
|
||||
+ "var_2",
|
||||
+ ]
|
||||
+ )
|
||||
|
||||
|
||||
-func({
|
||||
- "a": 37,
|
||||
- "b": 42,
|
||||
- "c": 927,
|
||||
- "aaaaaaaaaaaaaaaaaaaaaaaaa": 11111111111111111111111111111111111111111,
|
||||
-})
|
||||
+func(
|
||||
+ {
|
||||
+ "a": 37,
|
||||
+ "b": 42,
|
||||
+ "c": 927,
|
||||
+ "aaaaaaaaaaaaaaaaaaaaaaaaa": 11111111111111111111111111111111111111111,
|
||||
+ }
|
||||
+)
|
||||
|
||||
-func([
|
||||
- "random_string_number_one",
|
||||
- "random_string_number_two",
|
||||
- "random_string_number_three",
|
||||
- "random_string_number_four",
|
||||
-])
|
||||
+func(
|
||||
+ [
|
||||
+ "random_string_number_one",
|
||||
+ "random_string_number_two",
|
||||
+ "random_string_number_three",
|
||||
+ "random_string_number_four",
|
||||
+ ]
|
||||
+)
|
||||
|
||||
-func({
|
||||
- # expand me
|
||||
- "a": 37,
|
||||
- "b": 42,
|
||||
- "c": 927,
|
||||
-})
|
||||
+func(
|
||||
+ {
|
||||
+ # expand me
|
||||
+ "a": 37,
|
||||
+ "b": 42,
|
||||
+ "c": 927,
|
||||
+ }
|
||||
+)
|
||||
|
||||
-func([
|
||||
- "a",
|
||||
- "b",
|
||||
- "c",
|
||||
-])
|
||||
+func(
|
||||
+ [
|
||||
+ "a",
|
||||
+ "b",
|
||||
+ "c",
|
||||
+ ]
|
||||
+)
|
||||
|
||||
func(
|
||||
[
|
||||
@@ -47,17 +59,21 @@
|
||||
@@ -47,17 +47,21 @@
|
||||
],
|
||||
)
|
||||
|
||||
|
|
@ -316,67 +229,9 @@ for foo in ["a", "b"]:
|
|||
|
||||
func(
|
||||
# preserve me
|
||||
@@ -68,38 +84,48 @@
|
||||
]
|
||||
)
|
||||
|
||||
-func([ # preserve me but hug brackets
|
||||
- "c",
|
||||
- "d",
|
||||
- "e",
|
||||
-])
|
||||
+func(
|
||||
+ [ # preserve me but hug brackets
|
||||
+ "c",
|
||||
+ "d",
|
||||
+ "e",
|
||||
+ ]
|
||||
+)
|
||||
|
||||
-func([
|
||||
- # preserve me but hug brackets
|
||||
- "c",
|
||||
- "d",
|
||||
- "e",
|
||||
-])
|
||||
+func(
|
||||
+ [
|
||||
+ # preserve me but hug brackets
|
||||
+ "c",
|
||||
+ "d",
|
||||
+ "e",
|
||||
+ ]
|
||||
+)
|
||||
|
||||
-func([
|
||||
- "c",
|
||||
- # preserve me but hug brackets
|
||||
- "d",
|
||||
- "e",
|
||||
-])
|
||||
+func(
|
||||
+ [
|
||||
+ "c",
|
||||
+ # preserve me but hug brackets
|
||||
+ "d",
|
||||
+ "e",
|
||||
+ ]
|
||||
+)
|
||||
|
||||
-func([
|
||||
- "c",
|
||||
- "d",
|
||||
- "e",
|
||||
- # preserve me but hug brackets
|
||||
-])
|
||||
+func(
|
||||
+ [
|
||||
+ "c",
|
||||
+ "d",
|
||||
+ "e",
|
||||
+ # preserve me but hug brackets
|
||||
+ ]
|
||||
+)
|
||||
@@ -95,11 +99,13 @@
|
||||
# preserve me but hug brackets
|
||||
])
|
||||
|
||||
-func([
|
||||
- "c",
|
||||
|
|
@ -393,33 +248,24 @@ for foo in ["a", "b"]:
|
|||
|
||||
func(
|
||||
[
|
||||
@@ -114,50 +140,68 @@
|
||||
func(
|
||||
[x for x in "long line long line long line long line long line long line long line"]
|
||||
@@ -111,10 +117,10 @@
|
||||
)
|
||||
-func([
|
||||
- x
|
||||
- for x in [
|
||||
+func(
|
||||
+ [
|
||||
x
|
||||
- for x in "long line long line long line long line long line long line long line"
|
||||
+ for x in [
|
||||
+ x
|
||||
+ for x in "long line long line long line long line long line long line long line"
|
||||
+ ]
|
||||
]
|
||||
-])
|
||||
+)
|
||||
|
||||
func({"short line"})
|
||||
-func({
|
||||
- "long line",
|
||||
- "long long line",
|
||||
- "long long long line",
|
||||
- "long long long long line",
|
||||
- "long long long long long line",
|
||||
-})
|
||||
func([x for x in "short line"])
|
||||
-func(
|
||||
- [x for x in "long line long line long line long line long line long line long line"]
|
||||
-)
|
||||
func([
|
||||
+ x for x in "long line long line long line long line long line long line long line"
|
||||
+])
|
||||
+func([
|
||||
x
|
||||
for x in [
|
||||
x
|
||||
@@ -130,13 +136,15 @@
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
})
|
||||
-func({{
|
||||
- "long line",
|
||||
- "long long line",
|
||||
|
|
@ -427,20 +273,22 @@ for foo in ["a", "b"]:
|
|||
- "long long long long line",
|
||||
- "long long long long long line",
|
||||
-}})
|
||||
-func((
|
||||
- "long line",
|
||||
- "long long line",
|
||||
- "long long long line",
|
||||
- "long long long long line",
|
||||
- "long long long long long line",
|
||||
-))
|
||||
-func(((
|
||||
- "long line",
|
||||
- "long long line",
|
||||
- "long long long line",
|
||||
- "long long long long line",
|
||||
- "long long long long long line",
|
||||
-)))
|
||||
+func({
|
||||
+ {
|
||||
+ "long line",
|
||||
+ "long long line",
|
||||
+ "long long long line",
|
||||
+ "long long long long line",
|
||||
+ "long long long long long line",
|
||||
+ }
|
||||
+})
|
||||
func((
|
||||
"long line",
|
||||
"long long line",
|
||||
@@ -151,30 +159,62 @@
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
)))
|
||||
-func([[
|
||||
- "long line",
|
||||
- "long long line",
|
||||
|
|
@ -448,61 +296,81 @@ for foo in ["a", "b"]:
|
|||
- "long long long long line",
|
||||
- "long long long long long line",
|
||||
-]])
|
||||
+func(
|
||||
+ {
|
||||
+ "long line",
|
||||
+ "long long line",
|
||||
+ "long long long line",
|
||||
+ "long long long long line",
|
||||
+ "long long long long long line",
|
||||
+ }
|
||||
+)
|
||||
+func(
|
||||
+ {
|
||||
+ {
|
||||
+ "long line",
|
||||
+ "long long line",
|
||||
+ "long long long line",
|
||||
+ "long long long long line",
|
||||
+ "long long long long long line",
|
||||
+ }
|
||||
+ }
|
||||
+)
|
||||
+func(
|
||||
+ (
|
||||
+ "long line",
|
||||
+ "long long line",
|
||||
+ "long long long line",
|
||||
+ "long long long long line",
|
||||
+ "long long long long long line",
|
||||
+ )
|
||||
+)
|
||||
+func(
|
||||
+ (
|
||||
+ (
|
||||
+ "long line",
|
||||
+ "long long line",
|
||||
+ "long long long line",
|
||||
+ "long long long long line",
|
||||
+ "long long long long long line",
|
||||
+ )
|
||||
+ )
|
||||
+)
|
||||
+func(
|
||||
+func([
|
||||
+ [
|
||||
+ [
|
||||
+ "long line",
|
||||
+ "long long line",
|
||||
+ "long long long line",
|
||||
+ "long long long long line",
|
||||
+ "long long long long long line",
|
||||
+ ]
|
||||
+ "long line",
|
||||
+ "long long line",
|
||||
+ "long long long line",
|
||||
+ "long long long long line",
|
||||
+ "long long long long long line",
|
||||
+ ]
|
||||
+)
|
||||
+])
|
||||
|
||||
# Do not hug if the argument fits on a single line.
|
||||
func(
|
||||
@@ -194,18 +238,24 @@
|
||||
-func(
|
||||
- {"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
|
||||
-)
|
||||
-func(
|
||||
- ("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")
|
||||
-)
|
||||
-func(
|
||||
- ["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]
|
||||
-)
|
||||
-func(
|
||||
- **{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit---"}
|
||||
-)
|
||||
-func(
|
||||
- *("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit----")
|
||||
-)
|
||||
+func({
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+})
|
||||
+func((
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+))
|
||||
+func([
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+])
|
||||
+func(**{
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit---",
|
||||
+})
|
||||
+func(*(
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit line",
|
||||
+ "fit----",
|
||||
+))
|
||||
array = [
|
||||
{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
|
||||
]
|
||||
@@ -194,18 +234,24 @@
|
||||
)
|
||||
|
||||
nested_mapping = {
|
||||
|
|
@ -538,148 +406,64 @@ for foo in ["a", "b"]:
|
|||
explicit_exploding = [
|
||||
[
|
||||
[
|
||||
@@ -214,30 +264,42 @@
|
||||
],
|
||||
],
|
||||
]
|
||||
-single_item_do_not_explode = Context({
|
||||
- "version": get_docs_version(),
|
||||
-})
|
||||
+single_item_do_not_explode = Context(
|
||||
+ {
|
||||
+ "version": get_docs_version(),
|
||||
+ }
|
||||
+)
|
||||
|
||||
-foo(*[
|
||||
- "long long long long long line",
|
||||
- "long long long long long line",
|
||||
- "long long long long long line",
|
||||
-])
|
||||
+foo(
|
||||
+ *[
|
||||
+ "long long long long long line",
|
||||
+ "long long long long long line",
|
||||
+ "long long long long long line",
|
||||
+ ]
|
||||
+)
|
||||
|
||||
-foo(*[
|
||||
- str(i) for i in range(100000000000000000000000000000000000000000000000000000000000)
|
||||
-])
|
||||
+foo(
|
||||
+ *[
|
||||
+ str(i)
|
||||
+ for i in range(100000000000000000000000000000000000000000000000000000000000)
|
||||
+ ]
|
||||
+)
|
||||
|
||||
-foo(**{
|
||||
- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": 1,
|
||||
- "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": 2,
|
||||
- "ccccccccccccccccccccccccccccccccc": 3,
|
||||
- **other,
|
||||
-})
|
||||
+foo(
|
||||
+ **{
|
||||
+ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": 1,
|
||||
+ "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": 2,
|
||||
+ "ccccccccccccccccccccccccccccccccc": 3,
|
||||
+ **other,
|
||||
+ }
|
||||
+)
|
||||
|
||||
-foo(**{
|
||||
- x: y for x, y in enumerate(["long long long long line", "long long long long line"])
|
||||
-})
|
||||
+foo(
|
||||
+ **{
|
||||
+ x: y
|
||||
+ for x, y in enumerate(["long long long long line", "long long long long line"])
|
||||
+ }
|
||||
+)
|
||||
@@ -240,9 +286,9 @@
|
||||
})
|
||||
|
||||
# Edge case when deciding whether to hug the brackets without inner content.
|
||||
very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName(
|
||||
@@ -245,11 +307,13 @@
|
||||
)
|
||||
-very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName(
|
||||
- [[]]
|
||||
-)
|
||||
+very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName([
|
||||
+ []
|
||||
+])
|
||||
|
||||
for foo in ["a", "b"]:
|
||||
- output.extend([
|
||||
- individual
|
||||
- for
|
||||
- # Foobar
|
||||
- container in xs_by_y[foo]
|
||||
- # Foobar
|
||||
- for individual in container["nested"]
|
||||
- ])
|
||||
+ output.extend(
|
||||
+ [
|
||||
+ individual
|
||||
+ for
|
||||
+ # Foobar
|
||||
+ container in xs_by_y[foo]
|
||||
+ # Foobar
|
||||
+ for individual in container["nested"]
|
||||
+ ]
|
||||
+ )
|
||||
output.extend([
|
||||
```
|
||||
|
||||
## Ruff Output
|
||||
|
||||
```python
|
||||
def foo_brackets(request):
|
||||
return JsonResponse(
|
||||
{
|
||||
"var_1": foo,
|
||||
"var_2": bar,
|
||||
}
|
||||
)
|
||||
return JsonResponse({
|
||||
"var_1": foo,
|
||||
"var_2": bar,
|
||||
})
|
||||
|
||||
|
||||
def foo_square_brackets(request):
|
||||
return JsonResponse(
|
||||
[
|
||||
"var_1",
|
||||
"var_2",
|
||||
]
|
||||
)
|
||||
return JsonResponse([
|
||||
"var_1",
|
||||
"var_2",
|
||||
])
|
||||
|
||||
|
||||
func(
|
||||
{
|
||||
"a": 37,
|
||||
"b": 42,
|
||||
"c": 927,
|
||||
"aaaaaaaaaaaaaaaaaaaaaaaaa": 11111111111111111111111111111111111111111,
|
||||
}
|
||||
)
|
||||
func({
|
||||
"a": 37,
|
||||
"b": 42,
|
||||
"c": 927,
|
||||
"aaaaaaaaaaaaaaaaaaaaaaaaa": 11111111111111111111111111111111111111111,
|
||||
})
|
||||
|
||||
func(
|
||||
[
|
||||
"random_string_number_one",
|
||||
"random_string_number_two",
|
||||
"random_string_number_three",
|
||||
"random_string_number_four",
|
||||
]
|
||||
)
|
||||
func([
|
||||
"random_string_number_one",
|
||||
"random_string_number_two",
|
||||
"random_string_number_three",
|
||||
"random_string_number_four",
|
||||
])
|
||||
|
||||
func(
|
||||
{
|
||||
# expand me
|
||||
"a": 37,
|
||||
"b": 42,
|
||||
"c": 927,
|
||||
}
|
||||
)
|
||||
func({
|
||||
# expand me
|
||||
"a": 37,
|
||||
"b": 42,
|
||||
"c": 927,
|
||||
})
|
||||
|
||||
func(
|
||||
[
|
||||
"a",
|
||||
"b",
|
||||
"c",
|
||||
]
|
||||
)
|
||||
func([
|
||||
"a",
|
||||
"b",
|
||||
"c",
|
||||
])
|
||||
|
||||
func(
|
||||
[
|
||||
|
|
@ -714,40 +498,32 @@ func(
|
|||
]
|
||||
)
|
||||
|
||||
func(
|
||||
[ # preserve me but hug brackets
|
||||
"c",
|
||||
"d",
|
||||
"e",
|
||||
]
|
||||
)
|
||||
func([ # preserve me but hug brackets
|
||||
"c",
|
||||
"d",
|
||||
"e",
|
||||
])
|
||||
|
||||
func(
|
||||
[
|
||||
# preserve me but hug brackets
|
||||
"c",
|
||||
"d",
|
||||
"e",
|
||||
]
|
||||
)
|
||||
func([
|
||||
# preserve me but hug brackets
|
||||
"c",
|
||||
"d",
|
||||
"e",
|
||||
])
|
||||
|
||||
func(
|
||||
[
|
||||
"c",
|
||||
# preserve me but hug brackets
|
||||
"d",
|
||||
"e",
|
||||
]
|
||||
)
|
||||
func([
|
||||
"c",
|
||||
# preserve me but hug brackets
|
||||
"d",
|
||||
"e",
|
||||
])
|
||||
|
||||
func(
|
||||
[
|
||||
"c",
|
||||
"d",
|
||||
"e",
|
||||
# preserve me but hug brackets
|
||||
]
|
||||
)
|
||||
func([
|
||||
"c",
|
||||
"d",
|
||||
"e",
|
||||
# preserve me but hug brackets
|
||||
])
|
||||
|
||||
func(
|
||||
[
|
||||
|
|
@ -767,21 +543,26 @@ func(
|
|||
)
|
||||
|
||||
func([x for x in "short line"])
|
||||
func(
|
||||
[x for x in "long line long line long line long line long line long line long line"]
|
||||
)
|
||||
func(
|
||||
[
|
||||
func([
|
||||
x for x in "long line long line long line long line long line long line long line"
|
||||
])
|
||||
func([
|
||||
x
|
||||
for x in [
|
||||
x
|
||||
for x in [
|
||||
x
|
||||
for x in "long line long line long line long line long line long line long line"
|
||||
]
|
||||
for x in "long line long line long line long line long line long line long line"
|
||||
]
|
||||
)
|
||||
])
|
||||
|
||||
func({"short line"})
|
||||
func(
|
||||
func({
|
||||
"long line",
|
||||
"long long line",
|
||||
"long long long line",
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
})
|
||||
func({
|
||||
{
|
||||
"long line",
|
||||
"long long line",
|
||||
|
|
@ -789,66 +570,77 @@ func(
|
|||
"long long long long line",
|
||||
"long long long long long line",
|
||||
}
|
||||
)
|
||||
func(
|
||||
{
|
||||
{
|
||||
"long line",
|
||||
"long long line",
|
||||
"long long long line",
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
}
|
||||
}
|
||||
)
|
||||
func(
|
||||
(
|
||||
"long line",
|
||||
"long long line",
|
||||
"long long long line",
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
)
|
||||
)
|
||||
func(
|
||||
(
|
||||
(
|
||||
"long line",
|
||||
"long long line",
|
||||
"long long long line",
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
)
|
||||
)
|
||||
)
|
||||
func(
|
||||
})
|
||||
func((
|
||||
"long line",
|
||||
"long long line",
|
||||
"long long long line",
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
))
|
||||
func(((
|
||||
"long line",
|
||||
"long long line",
|
||||
"long long long line",
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
)))
|
||||
func([
|
||||
[
|
||||
[
|
||||
"long line",
|
||||
"long long line",
|
||||
"long long long line",
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
]
|
||||
"long line",
|
||||
"long long line",
|
||||
"long long long line",
|
||||
"long long long long line",
|
||||
"long long long long long line",
|
||||
]
|
||||
)
|
||||
])
|
||||
|
||||
# Do not hug if the argument fits on a single line.
|
||||
func(
|
||||
{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
|
||||
)
|
||||
func(
|
||||
("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")
|
||||
)
|
||||
func(
|
||||
["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]
|
||||
)
|
||||
func(
|
||||
**{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit---"}
|
||||
)
|
||||
func(
|
||||
*("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit----")
|
||||
)
|
||||
func({
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
})
|
||||
func((
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
))
|
||||
func([
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
])
|
||||
func(**{
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit---",
|
||||
})
|
||||
func(*(
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit line",
|
||||
"fit----",
|
||||
))
|
||||
array = [
|
||||
{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
|
||||
]
|
||||
|
|
@ -894,59 +686,45 @@ explicit_exploding = [
|
|||
],
|
||||
],
|
||||
]
|
||||
single_item_do_not_explode = Context(
|
||||
{
|
||||
"version": get_docs_version(),
|
||||
}
|
||||
)
|
||||
single_item_do_not_explode = Context({
|
||||
"version": get_docs_version(),
|
||||
})
|
||||
|
||||
foo(
|
||||
*[
|
||||
"long long long long long line",
|
||||
"long long long long long line",
|
||||
"long long long long long line",
|
||||
]
|
||||
)
|
||||
foo(*[
|
||||
"long long long long long line",
|
||||
"long long long long long line",
|
||||
"long long long long long line",
|
||||
])
|
||||
|
||||
foo(
|
||||
*[
|
||||
str(i)
|
||||
for i in range(100000000000000000000000000000000000000000000000000000000000)
|
||||
]
|
||||
)
|
||||
foo(*[
|
||||
str(i) for i in range(100000000000000000000000000000000000000000000000000000000000)
|
||||
])
|
||||
|
||||
foo(
|
||||
**{
|
||||
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": 1,
|
||||
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": 2,
|
||||
"ccccccccccccccccccccccccccccccccc": 3,
|
||||
**other,
|
||||
}
|
||||
)
|
||||
foo(**{
|
||||
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": 1,
|
||||
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": 2,
|
||||
"ccccccccccccccccccccccccccccccccc": 3,
|
||||
**other,
|
||||
})
|
||||
|
||||
foo(
|
||||
**{
|
||||
x: y
|
||||
for x, y in enumerate(["long long long long line", "long long long long line"])
|
||||
}
|
||||
)
|
||||
foo(**{
|
||||
x: y for x, y in enumerate(["long long long long line", "long long long long line"])
|
||||
})
|
||||
|
||||
# Edge case when deciding whether to hug the brackets without inner content.
|
||||
very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName(
|
||||
[[]]
|
||||
)
|
||||
very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName([
|
||||
[]
|
||||
])
|
||||
|
||||
for foo in ["a", "b"]:
|
||||
output.extend(
|
||||
[
|
||||
individual
|
||||
for
|
||||
# Foobar
|
||||
container in xs_by_y[foo]
|
||||
# Foobar
|
||||
for individual in container["nested"]
|
||||
]
|
||||
)
|
||||
output.extend([
|
||||
individual
|
||||
for
|
||||
# Foobar
|
||||
container in xs_by_y[foo]
|
||||
# Foobar
|
||||
for individual in container["nested"]
|
||||
])
|
||||
```
|
||||
|
||||
## Black Output
|
||||
|
|
|
|||
|
|
@ -573,7 +573,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
```diff
|
||||
--- Black
|
||||
+++ Ruff
|
||||
@@ -25,41 +25,42 @@
|
||||
@@ -25,20 +25,17 @@
|
||||
"Jaguar",
|
||||
)
|
||||
|
||||
|
|
@ -599,27 +599,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
)
|
||||
|
||||
|
||||
class A:
|
||||
def foo():
|
||||
- XXXXXXXXXXXX.append((
|
||||
- "xxx_xxxxxxxxxx(xxxxx={}, xxxx={}, xxxxx, xxxx_xxxx_xxxxxxxxxx={})".format(
|
||||
- xxxxx, xxxx, xxxx_xxxx_xxxxxxxxxx
|
||||
- ),
|
||||
- my_var,
|
||||
- my_other_var,
|
||||
- ))
|
||||
+ XXXXXXXXXXXX.append(
|
||||
+ (
|
||||
+ "xxx_xxxxxxxxxx(xxxxx={}, xxxx={}, xxxxx, xxxx_xxxx_xxxxxxxxxx={})".format(
|
||||
+ xxxxx, xxxx, xxxx_xxxx_xxxxxxxxxx
|
||||
+ ),
|
||||
+ my_var,
|
||||
+ my_other_var,
|
||||
+ )
|
||||
+ )
|
||||
|
||||
|
||||
class A:
|
||||
@@ -57,9 +54,11 @@
|
||||
class B:
|
||||
def foo():
|
||||
bar(
|
||||
|
|
@ -634,7 +614,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
),
|
||||
varX,
|
||||
varY,
|
||||
@@ -70,9 +71,10 @@
|
||||
@@ -70,9 +69,10 @@
|
||||
def foo(xxxx):
|
||||
for xxx_xxxx, _xxx_xxx, _xxx_xxxxx, xxx_xxxx in xxxx:
|
||||
for xxx in xxx_xxxx:
|
||||
|
|
@ -648,7 +628,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
)
|
||||
|
||||
|
||||
@@ -80,10 +82,11 @@
|
||||
@@ -80,10 +80,11 @@
|
||||
def disappearing_comment():
|
||||
return (
|
||||
( # xx -x xxxxxxx xx xxx xxxxxxx.
|
||||
|
|
@ -662,7 +642,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
"--xxxxxxx --xxxxxx=x --xxxxxx-xxxxx=xxxxxx"
|
||||
" --xxxxxx-xxxx=xxxxxxxxxxx.xxx"
|
||||
)
|
||||
@@ -113,18 +116,25 @@
|
||||
@@ -113,18 +114,25 @@
|
||||
|
||||
|
||||
func_call_where_string_arg_has_method_call_and_bad_parens(
|
||||
|
|
@ -694,7 +674,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
)
|
||||
|
||||
|
||||
@@ -132,52 +142,60 @@
|
||||
@@ -132,52 +140,60 @@
|
||||
def append(self):
|
||||
if True:
|
||||
xxxx.xxxxxxx.xxxxx(
|
||||
|
|
@ -788,7 +768,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
}
|
||||
|
||||
|
||||
@@ -185,10 +203,10 @@
|
||||
@@ -185,10 +201,10 @@
|
||||
def foo(self):
|
||||
if True:
|
||||
xxxxx_xxxxxxxxxxxx(
|
||||
|
|
@ -803,7 +783,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
)
|
||||
|
||||
|
||||
@@ -232,39 +250,24 @@
|
||||
@@ -232,39 +248,24 @@
|
||||
|
||||
some_dictionary = {
|
||||
"xxxxx006": [
|
||||
|
|
@ -852,7 +832,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
|
||||
some_commented_string = ( # This comment stays at the top.
|
||||
"This string is long but not so long that it needs hahahah toooooo be so greatttt"
|
||||
@@ -279,36 +282,25 @@
|
||||
@@ -279,38 +280,27 @@
|
||||
)
|
||||
|
||||
lpar_and_rpar_have_comments = func_call( # LPAR Comment
|
||||
|
|
@ -892,12 +872,14 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
- f" certainly, absolutely {does}."
|
||||
+ f"We have to remember to escape {braces}." " Like {these}." f" But not {this}."
|
||||
)
|
||||
-
|
||||
|
||||
-fstring = f"We have to remember to escape {braces}. Like {{these}}. But not {this}."
|
||||
|
||||
|
||||
-
|
||||
class A:
|
||||
@@ -364,10 +356,7 @@
|
||||
class B:
|
||||
def foo():
|
||||
@@ -364,10 +354,7 @@
|
||||
def foo():
|
||||
if not hasattr(module, name):
|
||||
raise ValueError(
|
||||
|
|
@ -909,7 +891,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
% (name, module_name, get_docs_version())
|
||||
)
|
||||
|
||||
@@ -382,35 +371,33 @@
|
||||
@@ -382,23 +369,19 @@
|
||||
|
||||
class Step(StepBase):
|
||||
def who(self):
|
||||
|
|
@ -931,29 +913,16 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
)
|
||||
|
||||
|
||||
-xxxxxxx_xxxxxx_xxxxxxx = xxx([
|
||||
- xxxxxxxxxxxx(
|
||||
- xxxxxx_xxxxxxx=(
|
||||
xxxxxxx_xxxxxx_xxxxxxx = xxx([
|
||||
xxxxxxxxxxxx(
|
||||
xxxxxx_xxxxxxx=(
|
||||
- '((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx ='
|
||||
- ' "xxxxxxxxxxxx")) && '
|
||||
- # xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx.
|
||||
- "(x.bbbbbbbbbbbb.xxx != "
|
||||
- '"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && '
|
||||
+xxxxxxx_xxxxxx_xxxxxxx = xxx(
|
||||
+ [
|
||||
+ xxxxxxxxxxxx(
|
||||
+ xxxxxx_xxxxxxx=(
|
||||
+ '((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx = "xxxxxxxxxxxx")) && '
|
||||
+ # xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx.
|
||||
+ "(x.bbbbbbbbbbbb.xxx != "
|
||||
+ '"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && '
|
||||
+ )
|
||||
)
|
||||
- )
|
||||
-])
|
||||
+ ]
|
||||
+)
|
||||
|
||||
+ '((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx = "xxxxxxxxxxxx")) && '
|
||||
# xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx.
|
||||
"(x.bbbbbbbbbbbb.xxx != "
|
||||
'"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && '
|
||||
@@ -409,8 +392,8 @@
|
||||
if __name__ == "__main__":
|
||||
for i in range(4, 8):
|
||||
cmd = (
|
||||
|
|
@ -964,7 +933,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
)
|
||||
|
||||
|
||||
@@ -432,14 +419,12 @@
|
||||
@@ -432,14 +415,12 @@
|
||||
assert xxxxxxx_xxxx in [
|
||||
x.xxxxx.xxxxxx.xxxxx.xxxxxx,
|
||||
x.xxxxx.xxxxxx.xxxxx.xxxx,
|
||||
|
|
@ -983,7 +952,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
|
||||
RE_ONE_BACKSLASH = {
|
||||
"asdf_hjkl_jkl": re.compile(
|
||||
@@ -449,8 +434,7 @@
|
||||
@@ -449,8 +430,7 @@
|
||||
|
||||
RE_TWO_BACKSLASHES = {
|
||||
"asdf_hjkl_jkl": re.compile(
|
||||
|
|
@ -993,7 +962,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
),
|
||||
}
|
||||
|
||||
@@ -462,13 +446,9 @@
|
||||
@@ -462,13 +442,9 @@
|
||||
|
||||
# We do NOT split on f-string expressions.
|
||||
print(
|
||||
|
|
@ -1009,7 +978,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
|
||||
# The parens should NOT be removed in this case.
|
||||
(
|
||||
@@ -478,8 +458,8 @@
|
||||
@@ -478,8 +454,8 @@
|
||||
|
||||
# The parens should NOT be removed in this case.
|
||||
(
|
||||
|
|
@ -1020,7 +989,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
)
|
||||
|
||||
# The parens should NOT be removed in this case.
|
||||
@@ -518,88 +498,78 @@
|
||||
@@ -518,88 +494,78 @@
|
||||
f"<<{author.display_name}>>\n"
|
||||
)
|
||||
|
||||
|
|
@ -1144,7 +1113,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
"6. Click on Create Credential at the top."
|
||||
'7. At the top click the link for "API key".'
|
||||
"8. No application restrictions are needed. Click Create at the bottom."
|
||||
@@ -613,55 +583,40 @@
|
||||
@@ -613,55 +579,40 @@
|
||||
f"<<{author.display_name}>>\n"
|
||||
)
|
||||
|
||||
|
|
@ -1217,7 +1186,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
|
|||
)
|
||||
|
||||
# Regression test for https://github.com/psf/black/issues/3455.
|
||||
@@ -672,9 +627,11 @@
|
||||
@@ -672,9 +623,11 @@
|
||||
}
|
||||
|
||||
# Regression test for https://github.com/psf/black/issues/3506.
|
||||
|
|
@ -1281,15 +1250,13 @@ class A:
|
|||
|
||||
class A:
|
||||
def foo():
|
||||
XXXXXXXXXXXX.append(
|
||||
(
|
||||
"xxx_xxxxxxxxxx(xxxxx={}, xxxx={}, xxxxx, xxxx_xxxx_xxxxxxxxxx={})".format(
|
||||
xxxxx, xxxx, xxxx_xxxx_xxxxxxxxxx
|
||||
),
|
||||
my_var,
|
||||
my_other_var,
|
||||
)
|
||||
)
|
||||
XXXXXXXXXXXX.append((
|
||||
"xxx_xxxxxxxxxx(xxxxx={}, xxxx={}, xxxxx, xxxx_xxxx_xxxxxxxxxx={})".format(
|
||||
xxxxx, xxxx, xxxx_xxxx_xxxxxxxxxx
|
||||
),
|
||||
my_var,
|
||||
my_other_var,
|
||||
))
|
||||
|
||||
|
||||
class A:
|
||||
|
|
@ -1620,18 +1587,16 @@ class Step(StepBase):
|
|||
)
|
||||
|
||||
|
||||
xxxxxxx_xxxxxx_xxxxxxx = xxx(
|
||||
[
|
||||
xxxxxxxxxxxx(
|
||||
xxxxxx_xxxxxxx=(
|
||||
'((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx = "xxxxxxxxxxxx")) && '
|
||||
# xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx.
|
||||
"(x.bbbbbbbbbbbb.xxx != "
|
||||
'"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && '
|
||||
)
|
||||
xxxxxxx_xxxxxx_xxxxxxx = xxx([
|
||||
xxxxxxxxxxxx(
|
||||
xxxxxx_xxxxxxx=(
|
||||
'((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx = "xxxxxxxxxxxx")) && '
|
||||
# xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx.
|
||||
"(x.bbbbbbbbbbbb.xxx != "
|
||||
'"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && '
|
||||
)
|
||||
]
|
||||
)
|
||||
)
|
||||
])
|
||||
|
||||
if __name__ == "__main__":
|
||||
for i in range(4, 8):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue