Define is_name_token (and friends) to resolve some `type: ignore`s (GH-2714)

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

diff --git a/src/black/mode.py b/src/black/mode.py
index b24c9c60dedc568758abdea95d086ba4c0ad0833..bd4428add66a22bb6f7db0bca6082a33f28df5bd 100644 (file)
--- a/src/black/mode.py
+++ b/src/black/mode.py
@@ -4,10 +4,18 @@ Mostly around Python language feature support per version and Black configuratio
 chosen by the user.
 """
 
 chosen by the user.
 """
 

+import sys
+

 from dataclasses import dataclass, field
 from enum import Enum
 from dataclasses import dataclass, field
 from enum import Enum

+from operator import attrgetter

 from typing import Dict, Set
 
 from typing import Dict, Set
 

+if sys.version_info < (3, 8):
+    from typing_extensions import Final
+else:
+    from typing import Final
+

 from black.const import DEFAULT_LINE_LENGTH
 
 
 from black.const import DEFAULT_LINE_LENGTH
 
 


@@ -41,8 +49,13 @@ class Feature(Enum):
     POS_ONLY_ARGUMENTS = 9
     RELAXED_DECORATORS = 10
     PATTERN_MATCHING = 11
     POS_ONLY_ARGUMENTS = 9
     RELAXED_DECORATORS = 10
     PATTERN_MATCHING = 11

+    UNPACKING_ON_FLOW = 12
+    ANN_ASSIGN_EXTENDED_RHS = 13

     FORCE_OPTIONAL_PARENTHESES = 50
 
     FORCE_OPTIONAL_PARENTHESES = 50
 

+    # __future__ flags
+    FUTURE_ANNOTATIONS = 51
+

     # temporary for Python 2 deprecation
     PRINT_STMT = 200
     EXEC_STMT = 201
     # temporary for Python 2 deprecation
     PRINT_STMT = 200
     EXEC_STMT = 201


@@ -54,6 +67,11 @@ class Feature(Enum):
     BACKQUOTE_REPR = 207
 
 
     BACKQUOTE_REPR = 207
 
 

+FUTURE_FLAG_TO_FEATURE: Final = {
+    "annotations": Feature.FUTURE_ANNOTATIONS,
+}
+
+

 VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
     TargetVersion.PY27: {
         Feature.ASYNC_IDENTIFIERS,
 VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
     TargetVersion.PY27: {
         Feature.ASYNC_IDENTIFIERS,


@@ -88,6 +106,7 @@ VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.ASYNC_KEYWORDS,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.ASYNC_KEYWORDS,

+        Feature.FUTURE_ANNOTATIONS,

     },
     TargetVersion.PY38: {
         Feature.UNICODE_LITERALS,
     },
     TargetVersion.PY38: {
         Feature.UNICODE_LITERALS,


@@ -96,8 +115,11 @@ VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.ASYNC_KEYWORDS,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.ASYNC_KEYWORDS,

+        Feature.FUTURE_ANNOTATIONS,

         Feature.ASSIGNMENT_EXPRESSIONS,
         Feature.POS_ONLY_ARGUMENTS,
         Feature.ASSIGNMENT_EXPRESSIONS,
         Feature.POS_ONLY_ARGUMENTS,

+        Feature.UNPACKING_ON_FLOW,
+        Feature.ANN_ASSIGN_EXTENDED_RHS,

     },
     TargetVersion.PY39: {
         Feature.UNICODE_LITERALS,
     },
     TargetVersion.PY39: {
         Feature.UNICODE_LITERALS,


@@ -106,11 +128,26 @@ VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.ASYNC_KEYWORDS,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.ASYNC_KEYWORDS,

+        Feature.FUTURE_ANNOTATIONS,

         Feature.ASSIGNMENT_EXPRESSIONS,
         Feature.RELAXED_DECORATORS,
         Feature.POS_ONLY_ARGUMENTS,
         Feature.ASSIGNMENT_EXPRESSIONS,
         Feature.RELAXED_DECORATORS,
         Feature.POS_ONLY_ARGUMENTS,

+        Feature.UNPACKING_ON_FLOW,
+        Feature.ANN_ASSIGN_EXTENDED_RHS,

     },
     TargetVersion.PY310: {
     },
     TargetVersion.PY310: {

+        Feature.UNICODE_LITERALS,
+        Feature.F_STRINGS,
+        Feature.NUMERIC_UNDERSCORES,
+        Feature.TRAILING_COMMA_IN_CALL,
+        Feature.TRAILING_COMMA_IN_DEF,
+        Feature.ASYNC_KEYWORDS,
+        Feature.FUTURE_ANNOTATIONS,
+        Feature.ASSIGNMENT_EXPRESSIONS,
+        Feature.RELAXED_DECORATORS,
+        Feature.POS_ONLY_ARGUMENTS,
+        Feature.UNPACKING_ON_FLOW,
+        Feature.ANN_ASSIGN_EXTENDED_RHS,

         Feature.PATTERN_MATCHING,
     },
 }
         Feature.PATTERN_MATCHING,
     },
 }


@@ -134,7 +171,7 @@ class Mode:
         if self.target_versions:
             version_str = ",".join(
                 str(version.value)
         if self.target_versions:
             version_str = ",".join(
                 str(version.value)

-                for version in sorted(self.target_versions, key=lambda v: v.value)
+                for version in sorted(self.target_versions, key=attrgetter("value"))

             )
         else:
             version_str = "-"
             )
         else:
             version_str = "-"