From: James Addison Date: Thu, 4 Feb 2021 17:37:25 +0000 (+0000) Subject: Brevity: only use the variables required to convey the intended expressions X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/a23f521fee1b283b10000d94267ef93069b7f7ec Brevity: only use the variables required to convey the intended expressions --- diff --git a/src/black/__init__.py b/src/black/__init__.py index 44017b5..67eef95 100644 --- a/src/black/__init__.py +++ b/src/black/__init__.py @@ -5971,7 +5971,7 @@ def generate_trailers_to_omit(line: Line, line_length: int) -> Iterator[Set[Leaf elif leaf.type in CLOSING_BRACKETS: prev = line.leaves[index - 1] if index > 0 else None if ( - (line.should_explode or line.magic_trailing_comma) + line.magic_trailing_comma and prev and prev.type == token.COMMA 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 if ( - (line.should_explode or line.magic_trailing_comma) + line.magic_trailing_comma and prev and prev.type == token.COMMA and not is_one_tuple_between(leaf.opening_bracket, leaf, line.leaves) @@ -6659,9 +6659,7 @@ def can_omit_invisible_parens( # unnecessary. return True - if ( - line.should_explode or line.magic_trailing_comma - ) and penultimate.type == token.COMMA: + if line.magic_trailing_comma and penultimate.type == token.COMMA: # The rightmost non-omitted bracket pair is the one we want to explode on. return True