mirror of
https://github.com/astral-sh/ruff.git
synced 2025-12-15 21:45:30 +00:00
Handle right parens in join comma builder (#5711)
This commit is contained in:
parent
f0aa6bd4d3
commit
653429bef9
11 changed files with 159 additions and 136 deletions
|
|
@ -315,30 +315,7 @@ long_unmergable_string_with_pragma = (
|
|||
|
||||
bad_split_func1(
|
||||
"But what should happen when code has already "
|
||||
@@ -96,15 +96,13 @@
|
||||
)
|
||||
|
||||
bad_split_func3(
|
||||
- (
|
||||
- "But what should happen when code has already "
|
||||
- r"been formatted but in the wrong way? Like "
|
||||
- "with a space at the end instead of the "
|
||||
- r"beginning. Or what about when it is split too "
|
||||
- r"soon? In the case of a split that is too "
|
||||
- "short, black will try to honer the custom "
|
||||
- "split."
|
||||
- ),
|
||||
+ "But what should happen when code has already "
|
||||
+ r"been formatted but in the wrong way? Like "
|
||||
+ "with a space at the end instead of the "
|
||||
+ r"beginning. Or what about when it is split too "
|
||||
+ r"soon? In the case of a split that is too "
|
||||
+ "short, black will try to honer the custom "
|
||||
+ "split.",
|
||||
xxx,
|
||||
yyy,
|
||||
zzz,
|
||||
@@ -143,9 +141,9 @@
|
||||
@@ -143,9 +143,9 @@
|
||||
)
|
||||
)
|
||||
|
||||
|
|
@ -350,7 +327,7 @@ long_unmergable_string_with_pragma = (
|
|||
|
||||
comment_string = "Long lines with inline comments should have their comments appended to the reformatted string's enclosing right parentheses." # This comment gets thrown to the top.
|
||||
|
||||
@@ -165,25 +163,13 @@
|
||||
@@ -165,25 +165,13 @@
|
||||
|
||||
triple_quote_string = """This is a really really really long triple quote string assignment and it should not be touched."""
|
||||
|
||||
|
|
@ -380,53 +357,18 @@ long_unmergable_string_with_pragma = (
|
|||
|
||||
some_function_call(
|
||||
"With a reallly generic name and with a really really long string that is, at some point down the line, "
|
||||
@@ -212,29 +198,25 @@
|
||||
)
|
||||
|
||||
@@ -221,8 +209,8 @@
|
||||
func_with_bad_comma(
|
||||
- (
|
||||
- "This is a really long string argument to a function that has a trailing comma"
|
||||
- " which should NOT be there."
|
||||
- ),
|
||||
+ "This is a really long string argument to a function that has a trailing comma"
|
||||
+ " which should NOT be there."
|
||||
)
|
||||
|
||||
func_with_bad_comma(
|
||||
- (
|
||||
- "This is a really long string argument to a function that has a trailing comma"
|
||||
(
|
||||
"This is a really long string argument to a function that has a trailing comma"
|
||||
- " which should NOT be there."
|
||||
- ), # comment after comma
|
||||
+ "This is a really long string argument to a function that has a trailing comma"
|
||||
+ " which should NOT be there." # comment after comma
|
||||
+ " which should NOT be there." # comment after comma
|
||||
+ ),
|
||||
)
|
||||
|
||||
func_with_bad_parens_that_wont_fit_in_one_line(
|
||||
- ("short string that should have parens stripped"), x, y, z
|
||||
+ "short string that should have parens stripped", x, y, z
|
||||
)
|
||||
|
||||
func_with_bad_parens_that_wont_fit_in_one_line(
|
||||
- x, y, ("short string that should have parens stripped"), z
|
||||
+ x, y, "short string that should have parens stripped", z
|
||||
)
|
||||
|
||||
func_with_bad_parens(
|
||||
- ("short string that should have parens stripped"),
|
||||
+ "short string that should have parens stripped",
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
@@ -243,7 +225,7 @@
|
||||
func_with_bad_parens(
|
||||
x,
|
||||
y,
|
||||
- ("short string that should have parens stripped"),
|
||||
+ "short string that should have parens stripped",
|
||||
z,
|
||||
)
|
||||
|
||||
@@ -271,10 +253,10 @@
|
||||
@@ -271,10 +259,10 @@
|
||||
|
||||
|
||||
def foo():
|
||||
|
|
@ -542,13 +484,15 @@ bad_split_func2(
|
|||
)
|
||||
|
||||
bad_split_func3(
|
||||
"But what should happen when code has already "
|
||||
r"been formatted but in the wrong way? Like "
|
||||
"with a space at the end instead of the "
|
||||
r"beginning. Or what about when it is split too "
|
||||
r"soon? In the case of a split that is too "
|
||||
"short, black will try to honer the custom "
|
||||
"split.",
|
||||
(
|
||||
"But what should happen when code has already "
|
||||
r"been formatted but in the wrong way? Like "
|
||||
"with a space at the end instead of the "
|
||||
r"beginning. Or what about when it is split too "
|
||||
r"soon? In the case of a split that is too "
|
||||
"short, black will try to honer the custom "
|
||||
"split."
|
||||
),
|
||||
xxx,
|
||||
yyy,
|
||||
zzz,
|
||||
|
|
@ -644,25 +588,29 @@ func_with_bad_comma(
|
|||
)
|
||||
|
||||
func_with_bad_comma(
|
||||
"This is a really long string argument to a function that has a trailing comma"
|
||||
" which should NOT be there."
|
||||
(
|
||||
"This is a really long string argument to a function that has a trailing comma"
|
||||
" which should NOT be there."
|
||||
),
|
||||
)
|
||||
|
||||
func_with_bad_comma(
|
||||
"This is a really long string argument to a function that has a trailing comma"
|
||||
" which should NOT be there." # comment after comma
|
||||
(
|
||||
"This is a really long string argument to a function that has a trailing comma"
|
||||
" which should NOT be there." # comment after comma
|
||||
),
|
||||
)
|
||||
|
||||
func_with_bad_parens_that_wont_fit_in_one_line(
|
||||
"short string that should have parens stripped", x, y, z
|
||||
("short string that should have parens stripped"), x, y, z
|
||||
)
|
||||
|
||||
func_with_bad_parens_that_wont_fit_in_one_line(
|
||||
x, y, "short string that should have parens stripped", z
|
||||
x, y, ("short string that should have parens stripped"), z
|
||||
)
|
||||
|
||||
func_with_bad_parens(
|
||||
"short string that should have parens stripped",
|
||||
("short string that should have parens stripped"),
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
|
|
@ -671,7 +619,7 @@ func_with_bad_parens(
|
|||
func_with_bad_parens(
|
||||
x,
|
||||
y,
|
||||
"short string that should have parens stripped",
|
||||
("short string that should have parens stripped"),
|
||||
z,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ while x := f(x):
|
|||
x = (y := 0)
|
||||
(z := (y := (x := 0)))
|
||||
(info := (name, phone, *rest))
|
||||
@@ -31,17 +31,17 @@
|
||||
@@ -31,9 +31,9 @@
|
||||
len(lines := f.readlines())
|
||||
foo(x := 3, cat="vector")
|
||||
foo(cat=(category := "vector"))
|
||||
|
|
@ -95,9 +95,8 @@ while x := f(x):
|
|||
return env_base
|
||||
if self._is_special and (ans := self._check_nans(context=context)):
|
||||
return ans
|
||||
foo(b := 2, a=1)
|
||||
-foo((b := 2), a=1)
|
||||
+foo(b := 2, a=1)
|
||||
@@ -41,7 +41,7 @@
|
||||
foo((b := 2), a=1)
|
||||
foo(c=(b := 2), a=1)
|
||||
|
||||
-while x := f(x):
|
||||
|
|
@ -151,7 +150,7 @@ if (env_base := os.environ.get("PYTHONUSERBASE", None)):
|
|||
if self._is_special and (ans := self._check_nans(context=context)):
|
||||
return ans
|
||||
foo(b := 2, a=1)
|
||||
foo(b := 2, a=1)
|
||||
foo((b := 2), a=1)
|
||||
foo(c=(b := 2), a=1)
|
||||
|
||||
while (x := f(x)):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue