]> 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:

Fix invalid code in an omitted trailer on large expressions
authorŁukasz Langa <lukasz@langa.pl>
Mon, 21 May 2018 19:29:36 +0000 (12:29 -0700)
committerŁukasz Langa <lukasz@langa.pl>
Mon, 21 May 2018 19:29:36 +0000 (12:29 -0700)
Fixes #237

README.md
black.py
tests/composition.py

index f3a9bb82c964f52ad4f3437e57904350472219fc..7038d9656cbc64e8239c9c73e77f513c47b1a6e6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -654,7 +654,11 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
 ### 18.5b1 (unreleased)
 
 * Python grammar pickle caches are stored with the formatting caches, making
 ### 18.5b1 (unreleased)
 
 * Python grammar pickle caches are stored with the formatting caches, making
-  *Black* work in environments where site-packages is not user-writable (#192).
+  *Black* work in environments where site-packages is not user-writable (#192)
+
+* fixed invalid code produced when standalone comments were present in a trailer
+  that was omitted from line splitting on a large expression (#237)
+
 
 ### 18.5b0
 
 
 ### 18.5b0
 
index 46c64a317935952e956a982321afb35d1d3d1dfd..8d551640f365e8dd0072adc08cbb0452cad1c715 100644 (file)
--- a/black.py
+++ b/black.py
@@ -2606,6 +2606,9 @@ def generate_trailers_to_omit(line: Line, line_length: int) -> Iterator[Set[Leaf
         if length > line_length:
             break
 
         if length > line_length:
             break
 
+        if leaf.type == STANDALONE_COMMENT:
+            break
+
         optional_brackets.discard(id(leaf))
         if opening_bracket:
             if leaf is opening_bracket:
         optional_brackets.discard(id(leaf))
         if opening_bracket:
             if leaf is opening_bracket:
index 71eee6a86cd3edcbe599e109e741233dc8d86786..f8cd5edb10677a8aa92b0c70ca3d4ff65a5ade8a 100644 (file)
@@ -32,6 +32,14 @@ class C:
                         # Another
                     ):
                         print(i)
                         # Another
                     ):
                         print(i)
+        xxxxxxxxxxxxxxxx = Yyyy2YyyyyYyyyyy(
+            push_manager=context.request.resource_manager,
+            max_items_to_push=num_items,
+            batch_size=Yyyy2YyyyYyyyyYyyy.FULL_SIZE,
+        ).push(
+            # Only send the first n items.
+            items=items[:num_items]
+        )
         return (
             "Utterly failed doctest test for %s\n"
             '  File "%s", line %s, in %s\n\n%s'
         return (
             "Utterly failed doctest test for %s\n"
             '  File "%s", line %s, in %s\n\n%s'