]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Brevity: only use the variables required to convey the intended expressions
authorJames Addison <jay@jp-hosting.net>
Thu, 4 Feb 2021 17:37:25 +0000 (17:37 +0000)
committerŁukasz Langa <lukasz@langa.pl>
Sat, 20 Feb 2021 18:36:21 +0000 (19:36 +0100)
src/black/__init__.py

index 44017b59602849b5eb57fb6d2bf38cb217d9e647..67eef95390d76693be184a7f67c81836b28e8409 100644 (file)
@@ -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