Fix parser bug where "type" was misinterpreted as a keyword inside a match (#3950)

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

diff --git a/src/black/nodes.py b/src/black/nodes.py
index ef42278d83f524224eee579fc0403a0169f75ab8..edd201a21e9f2311d3482c1183f1d100e1f073ef 100644 (file)
--- a/src/black/nodes.py
+++ b/src/black/nodes.py
@@ -13,6 +13,7 @@ else:
 from mypy_extensions import mypyc_attr
 
 from black.cache import CACHE_DIR
 from mypy_extensions import mypyc_attr
 
 from black.cache import CACHE_DIR

+from black.mode import Mode, Preview

 from black.strings import has_triple_quotes
 from blib2to3 import pygram
 from blib2to3.pgen2 import token
 from black.strings import has_triple_quotes
 from blib2to3 import pygram
 from blib2to3.pgen2 import token


@@ -171,7 +172,7 @@ class Visitor(Generic[T]):
                 yield from self.visit(child)
 
 
                 yield from self.visit(child)
 
 

-def whitespace(leaf: Leaf, *, complex_subscript: bool) -> str:  # noqa: C901
+def whitespace(leaf: Leaf, *, complex_subscript: bool, mode: Mode) -> str:  # noqa: C901

     """Return whitespace prefix if needed for the given `leaf`.
 
     `complex_subscript` signals whether the given leaf is part of a subscription
     """Return whitespace prefix if needed for the given `leaf`.
 
     `complex_subscript` signals whether the given leaf is part of a subscription


@@ -345,6 +346,11 @@ def whitespace(leaf: Leaf, *, complex_subscript: bool) -> str:  # noqa: C901
 
             return NO
 
 
             return NO
 

+        elif Preview.walrus_subscript in mode and (
+            t == token.COLONEQUAL or prev.type == token.COLONEQUAL
+        ):
+            return SPACE
+

         elif not complex_subscript:
             return NO
 
         elif not complex_subscript:
             return NO
 


@@ -714,6 +720,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 +733,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 +749,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)
     )