Bump pypa/cibuildwheel from 2.11.3 to 2.11.4 (#3475)

[etc/vim.git] / src / black / comments.py

diff --git a/src/black/comments.py b/src/black/comments.py
index 2a4c254ecd9119b2796c7116d92890d94c024981..e733dccd8441198325b3e99061689a6e2f0c0e6c 100644 (file)
--- a/src/black/comments.py
+++ b/src/black/comments.py
@@ -232,7 +232,7 @@ def generate_ignored_nodes(
 
         # fix for fmt: on in children
         if children_contains_fmt_on(container, preview=preview):
 
         # fix for fmt: on in children
         if children_contains_fmt_on(container, preview=preview):

-            for child in container.children:
+            for index, child in enumerate(container.children):

                 if isinstance(child, Leaf) and is_fmt_on(child, preview=preview):
                     if child.type in CLOSING_BRACKETS:
                         # This means `# fmt: on` is placed at a different bracket level
                 if isinstance(child, Leaf) and is_fmt_on(child, preview=preview):
                     if child.type in CLOSING_BRACKETS:
                         # This means `# fmt: on` is placed at a different bracket level


@@ -241,6 +241,16 @@ def generate_ignored_nodes(
                         # The alternative is to fail the formatting.
                         yield child
                     return
                         # The alternative is to fail the formatting.
                         yield child
                     return

+                if (
+                    child.type == token.INDENT
+                    and index < len(container.children) - 1
+                    and children_contains_fmt_on(
+                        container.children[index + 1], preview=preview
+                    )
+                ):
+                    # This means `# fmt: on` is placed right after an indentation
+                    # level, and we shouldn't swallow the previous INDENT token.
+                    return

                 if children_contains_fmt_on(child, preview=preview):
                     return
                 yield child
                 if children_contains_fmt_on(child, preview=preview):
                     return
                 yield child


@@ -270,8 +280,7 @@ def _generate_ignored_nodes_from_fmt_skip(
         while "\n" not in prev_sibling.prefix and prev_sibling.prev_sibling is not None:
             prev_sibling = prev_sibling.prev_sibling
             siblings.insert(0, prev_sibling)
         while "\n" not in prev_sibling.prefix and prev_sibling.prev_sibling is not None:
             prev_sibling = prev_sibling.prev_sibling
             siblings.insert(0, prev_sibling)

-        for sibling in siblings:
-            yield sibling
+        yield from siblings

     elif (
         parent is not None and parent.type == syms.suite and leaf.type == token.NEWLINE
     ):
     elif (
         parent is not None and parent.type == syms.suite and leaf.type == token.NEWLINE
     ):