actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Brevity: only use the variables required to convey the intended expressions

Browse Source
This commit is contained in:
James Addison 2021-02-04 17:37:25 +00:00 committed by Łukasz Langa
parent caa3fcc2de
commit a23f521fee
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/black/__init__.py
View File

@ -5971,7 +5971,7 @@ def generate_trailers_to_omit(line: Line, line_length: int) -> Iterator[Set[Leaf
elif leaf.type in CLOSING_BRACKETS: elif leaf.type in CLOSING_BRACKETS:
prev = line.leaves[index - 1] if index > 0 else None prev = line.leaves[index - 1] if index > 0 else None
if ( if (
(line.should_explode or line.magic_trailing_comma) line.magic_trailing_comma
and prev and prev
and prev.type == token.COMMA and prev.type == token.COMMA
and not is_one_tuple_between( and not is_one_tuple_between(
@ -5999,7 +5999,7 @@ def generate_trailers_to_omit(line: Line, line_length: int) -> Iterator[Set[Leaf
yield omit yield omit
if ( if (
(line.should_explode or line.magic_trailing_comma) line.magic_trailing_comma
and prev and prev
and prev.type == token.COMMA and prev.type == token.COMMA
and not is_one_tuple_between(leaf.opening_bracket, leaf, line.leaves) and not is_one_tuple_between(leaf.opening_bracket, leaf, line.leaves)
@ -6659,9 +6659,7 @@ def can_omit_invisible_parens(
# unnecessary. # unnecessary.
return True return True
if ( if line.magic_trailing_comma and penultimate.type == token.COMMA:
line.should_explode or line.magic_trailing_comma
) and penultimate.type == token.COMMA:
# The rightmost non-omitted bracket pair is the one we want to explode on. # The rightmost non-omitted bracket pair is the one we want to explode on.
return True return True