Extract a separate function to handle the # fmt: skip comment.

src/black/comments.py

@@ -216,53 +216,10 @@ def generate_ignored_nodes(
     If comment is skip, returns leaf only.
     Stops at the end of the block.
     """
-    container: Optional[LN] = container_of(leaf)
     if comment.value in FMT_SKIP:
-        prev_sibling = leaf.prev_sibling
-        parent = leaf.parent
-        # Need to properly format the leaf prefix to compare it to comment.value,
-        # which is also formatted
-        comments = list_comments(leaf.prefix, is_endmarker=False, preview=preview)
-        if comments and comment.value == comments[0].value:
-            if prev_sibling is not None:
-                leaf.prefix = ""
-                siblings = [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
-            elif (
-                parent is not None
-                and type_repr(parent.type) == "suite"
-                and leaf.type == token.NEWLINE
-            ):
-                # The `# fmt: skip` is on the colon line of the if/while/def/class/...
-                # statements. The ignored nodes should be previous siblings of the
-                # parent suite node.
-                leaf.prefix = ""
-                ignored_nodes: List[LN] = []
-                parent_sibling = parent.prev_sibling
-                while (
-                    parent_sibling is not None
-                    and type_repr(parent_sibling.type) != "suite"
-                ):
-                    ignored_nodes.insert(0, parent_sibling)
-                    parent_sibling = parent_sibling.prev_sibling
-                # Special case for `async_stmt` where the ASYNC token is on the
-                # grandparent node.
-                grandparent = parent.parent
-                if (
-                    grandparent is not None
-                    and grandparent.prev_sibling is not None
-                    and grandparent.prev_sibling.type == token.ASYNC
-                ):
-                    ignored_nodes.insert(0, grandparent.prev_sibling)
-                yield from iter(ignored_nodes)
+        yield from _generate_ignored_nodes_from_fmt_skip(leaf, comment, preview=preview)
         return
+    container: Optional[LN] = container_of(leaf)
     while container is not None and container.type != token.ENDMARKER:
         if is_fmt_on(container, preview=preview):
             return
@@ -278,6 +235,55 @@ def generate_ignored_nodes(
             container = container.next_sibling
 
 
+def _generate_ignored_nodes_from_fmt_skip(
+    leaf: Leaf, comment: ProtoComment, *, preview: bool
+) -> Iterator[LN]:
+    """Generate all leaves that should be ignored by the `# fmt: skip` from `leaf`."""
+    prev_sibling = leaf.prev_sibling
+    parent = leaf.parent
+    # Need to properly format the leaf prefix to compare it to comment.value,
+    # which is also formatted
+    comments = list_comments(leaf.prefix, is_endmarker=False, preview=preview)
+    if comments and comment.value == comments[0].value:
+        if prev_sibling is not None:
+            leaf.prefix = ""
+            siblings = [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
+        elif (
+            parent is not None
+            and type_repr(parent.type) == "suite"
+            and leaf.type == token.NEWLINE
+        ):
+            # The `# fmt: skip` is on the colon line of the if/while/def/class/...
+            # statements. The ignored nodes should be previous siblings of the
+            # parent suite node.
+            leaf.prefix = ""
+            ignored_nodes: List[LN] = []
+            parent_sibling = parent.prev_sibling
+            while (
+                parent_sibling is not None and type_repr(parent_sibling.type) != "suite"
+            ):
+                ignored_nodes.insert(0, parent_sibling)
+                parent_sibling = parent_sibling.prev_sibling
+            # Special case for `async_stmt` where the ASYNC token is on the
+            # grandparent node.
+            grandparent = parent.parent
+            if (
+                grandparent is not None
+                and grandparent.prev_sibling is not None
+                and grandparent.prev_sibling.type == token.ASYNC
+            ):
+                ignored_nodes.insert(0, grandparent.prev_sibling)
+            yield from iter(ignored_nodes)
+
+
 def is_fmt_on(container: LN, preview: bool) -> bool:
     """Determine whether formatting is switched on within a container.
     Determined by whether the last `# fmt:` comment is `on` or `off`.