From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Sat, 4 Dec 2021 23:30:23 +0000 (-0800)
Subject: tell users to use -t py310 (#2668)
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/dc8cdda8fdd6941103240ae3279034d2acdc69bc?ds=sidebyside

tell users to use -t py310 (#2668)
---

diff --git a/CHANGES.md b/CHANGES.md
index 5d89c71..dcb51f7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,7 @@
 
 ### _Black_
 
+- Point users to using `--target-version py310` if we detect 3.10-only syntax (#2668)
 - Cell magics are now only processed if they are known Python cell magics. Earlier, all
   cell magics were tokenized, leading to possible indentation errors e.g. with
   `%%writefile`. (#2630)
diff --git a/src/black/parsing.py b/src/black/parsing.py
index b673027..2fd41f0 100644
--- a/src/black/parsing.py
+++ b/src/black/parsing.py
@@ -43,6 +43,11 @@ except ImportError:
         ast3 = ast27 = ast
 
 
+PY310_HINT: Final[
+    str
+] = "Consider using --target-version py310 to parse Python 3.10 code."
+
+
 class InvalidInput(ValueError):
     """Raised when input source code fails all parse attempts."""
 
@@ -96,7 +101,8 @@ def lib2to3_parse(src_txt: str, target_versions: Iterable[TargetVersion] = ()) -
     if not src_txt.endswith("\n"):
         src_txt += "\n"
 
-    for grammar in get_grammars(set(target_versions)):
+    grammars = get_grammars(set(target_versions))
+    for grammar in grammars:
         drv = driver.Driver(grammar)
         try:
             result = drv.parse_string(src_txt, True)
@@ -117,6 +123,12 @@ def lib2to3_parse(src_txt: str, target_versions: Iterable[TargetVersion] = ()) -
             exc = InvalidInput(f"Cannot parse: {lineno}:{column}: {te.args[0]}")
 
     else:
+        if pygram.python_grammar_soft_keywords not in grammars and matches_grammar(
+            src_txt, pygram.python_grammar_soft_keywords
+        ):
+            original_msg = exc.args[0]
+            msg = f"{original_msg}\n{PY310_HINT}"
+            raise InvalidInput(msg) from None
         raise exc from None
 
     if isinstance(result, Leaf):
@@ -124,6 +136,16 @@ def lib2to3_parse(src_txt: str, target_versions: Iterable[TargetVersion] = ()) -
     return result
 
 
+def matches_grammar(src_txt: str, grammar: Grammar) -> bool:
+    drv = driver.Driver(grammar)
+    try:
+        drv.parse_string(src_txt, True)
+    except ParseError:
+        return False
+    else:
+        return True
+
+
 def lib2to3_unparse(node: Node) -> str:
     """Given a lib2to3 node, return its string representation."""
     code = str(node)
diff --git a/tests/test_format.py b/tests/test_format.py
index d44be1e..30099aa 100644
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -210,6 +210,15 @@ def test_patma_invalid() -> None:
     exc_info.match("Cannot parse: 10:11")
 
 
+def test_patma_hint() -> None:
+    source, expected = read_data("pattern_matching_simple")
+    mode = black.Mode(target_versions={black.TargetVersion.PY39})
+    with pytest.raises(black.parsing.InvalidInput) as exc_info:
+        assert_format(source, expected, mode, minimum_version=(3, 10))
+
+    exc_info.match(black.parsing.PY310_HINT)
+
+
 def test_docstring_no_string_normalization() -> None:
     """Like test_docstring but with string normalization off."""
     source, expected = read_data("docstring_no_string_normalization")