Fix removed comments in stub files (#3745)

diff --git a/CHANGES.md b/CHANGES.md
index 93d8ee1921ac3e8c79a3c4e9cf8fc8c8bd1e8ab1..bb304296d63da03c2bc4f5bf8839e536eac02e1d 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,8 @@
 
 - Fix a bug where an illegal trailing comma was added to return type annotations using
   PEP 604 unions (#3735)
 
 - Fix a bug where an illegal trailing comma was added to return type annotations using
   PEP 604 unions (#3735)

+- Fix several bugs and crashes where comments in stub files were removed or mishandled
+  under some circumstances. (#3745)

 - Fix a bug where multi-line open parenthesis magic comment like `type: ignore` were not
   correctly parsed (#3740)
 
 - Fix a bug where multi-line open parenthesis magic comment like `type: ignore` were not
   correctly parsed (#3740)
 

diff --git a/src/black/nodes.py b/src/black/nodes.py
index ef42278d83f524224eee579fc0403a0169f75ab8..45423b2596be6946b203151c9a93200e25eb92df 100644 (file)
--- a/src/black/nodes.py
+++ b/src/black/nodes.py
@@ -714,6 +714,11 @@ def is_multiline_string(leaf: Leaf) -> bool:
 
 def is_stub_suite(node: Node) -> bool:
     """Return True if `node` is a suite with a stub body."""
 
 def is_stub_suite(node: Node) -> bool:
     """Return True if `node` is a suite with a stub body."""

+
+    # If there is a comment, we want to keep it.
+    if node.prefix.strip():
+        return False
+

     if (
         len(node.children) != 4
         or node.children[0].type != token.NEWLINE
     if (
         len(node.children) != 4
         or node.children[0].type != token.NEWLINE


@@ -722,6 +727,9 @@ def is_stub_suite(node: Node) -> bool:
     ):
         return False
 
     ):
         return False
 

+    if node.children[3].prefix.strip():
+        return False
+

     return is_stub_body(node.children[2])
 
 
     return is_stub_body(node.children[2])
 
 


@@ -735,7 +743,8 @@ def is_stub_body(node: LN) -> bool:
 
     child = node.children[0]
     return (
 
     child = node.children[0]
     return (

-        child.type == syms.atom
+        not child.prefix.strip()
+        and child.type == syms.atom

         and len(child.children) == 3
         and all(leaf == Leaf(token.DOT, ".") for leaf in child.children)
     )
         and len(child.children) == 3
         and all(leaf == Leaf(token.DOT, ".") for leaf in child.children)
     )

diff --git a/tests/data/simple_cases/ignore_pyi.py b/tests/data/simple_cases/ignore_pyi.py
new file mode 100644 (file)
index 0000000..3ef6107
--- /dev/null
+++ b/tests/data/simple_cases/ignore_pyi.py
@@ -0,0 +1,41 @@
+def f():  # type: ignore
+    ...
+
+class x:  # some comment
+    ...
+
+class y:
+    ...  # comment
+
+# whitespace doesn't matter (note the next line has a trailing space and tab)
+class z:        
+    ...
+
+def g():
+    # hi
+    ...
+
+def h():
+    ...
+    # bye
+
+# output
+
+def f():  # type: ignore
+    ...
+
+class x:  # some comment
+    ...
+
+class y: ...  # comment
+
+# whitespace doesn't matter (note the next line has a trailing space and tab)
+class z: ...
+
+def g():
+    # hi
+    ...
+
+def h():
+    ...
+    # bye

diff --git a/tests/test_format.py b/tests/test_format.py
index 8e0ada99cba0138aa446d535c35fe55c3e895dd9..fb4d8eb4346aaedc752743b10a21619797274b76 100644 (file)
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -33,9 +33,10 @@ def check_file(
 @pytest.mark.parametrize("filename", all_data_cases("simple_cases"))
 def test_simple_format(filename: str) -> None:
     magic_trailing_comma = filename != "skip_magic_trailing_comma"
 @pytest.mark.parametrize("filename", all_data_cases("simple_cases"))
 def test_simple_format(filename: str) -> None:
     magic_trailing_comma = filename != "skip_magic_trailing_comma"

-    check_file(
-        "simple_cases", filename, black.Mode(magic_trailing_comma=magic_trailing_comma)
+    mode = black.Mode(
+        magic_trailing_comma=magic_trailing_comma, is_pyi=filename.endswith("_pyi")

     )
     )

+    check_file("simple_cases", filename, mode)

 
 
 @pytest.mark.parametrize("filename", all_data_cases("preview"))
 
 
 @pytest.mark.parametrize("filename", all_data_cases("preview"))