Add isort to linting toolchain

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

diff --git a/src/black/parsing.py b/src/black/parsing.py
index 1272656794873ec67696bd1fbc40d4364ea76bdf..d1ad7d2c671a605d5a8745f39f47de355ae22cae 100644 (file)
--- a/src/black/parsing.py
+++ b/src/black/parsing.py
@@ -152,14 +152,22 @@ def parse_single_version(
     src: str, version: Tuple[int, int]
 ) -> Union[ast.AST, ast3.AST]:
     filename = "<unknown>"
     src: str, version: Tuple[int, int]
 ) -> Union[ast.AST, ast3.AST]:
     filename = "<unknown>"

-    # typed_ast is needed because of feature version limitations in the builtin ast
+    # typed-ast is needed because of feature version limitations in the builtin ast 3.8>

     if sys.version_info >= (3, 8) and version >= (3,):
     if sys.version_info >= (3, 8) and version >= (3,):

-        return ast.parse(src, filename, feature_version=version)
-    elif version >= (3,):
-        if _IS_PYPY:
-            return ast3.parse(src, filename)
+        return ast.parse(src, filename, feature_version=version, type_comments=True)
+
+    if _IS_PYPY:
+        # PyPy 3.7 doesn't support type comment tracking which is not ideal, but there's
+        # not much we can do as typed-ast won't work either.
+        if sys.version_info >= (3, 8):
+            return ast3.parse(src, filename, type_comments=True)

         else:
         else:

-            return ast3.parse(src, filename, feature_version=version[1])
+            return ast3.parse(src, filename)
+    else:
+        # Typed-ast is guaranteed to be used here and automatically tracks type
+        # comments separately.
+        return ast3.parse(src, filename, feature_version=version[1])
+

     raise AssertionError("INTERNAL ERROR: Tried parsing unsupported Python version!")
 
 
     raise AssertionError("INTERNAL ERROR: Tried parsing unsupported Python version!")