Improve order of paragraphs on line splitting (#3270)

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

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

-from hashlib import sha256

 import sys
 import sys

-

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

+from hashlib import sha256

 from operator import attrgetter
 from typing import Dict, Set
 from warnings import warn
 from operator import attrgetter
 from typing import Dict, Set
 from warnings import warn


@@ -49,6 +48,8 @@ class Feature(Enum):
     UNPACKING_ON_FLOW = 12
     ANN_ASSIGN_EXTENDED_RHS = 13
     EXCEPT_STAR = 14
     UNPACKING_ON_FLOW = 12
     ANN_ASSIGN_EXTENDED_RHS = 13
     EXCEPT_STAR = 14

+    VARIADIC_GENERICS = 15
+    DEBUG_F_STRINGS = 16

     FORCE_OPTIONAL_PARENTHESES = 50
 
     # __future__ flags
     FORCE_OPTIONAL_PARENTHESES = 50
 
     # __future__ flags


@@ -81,6 +82,7 @@ VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
     },
     TargetVersion.PY38: {
         Feature.F_STRINGS,
     },
     TargetVersion.PY38: {
         Feature.F_STRINGS,

+        Feature.DEBUG_F_STRINGS,

         Feature.NUMERIC_UNDERSCORES,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.NUMERIC_UNDERSCORES,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,


@@ -93,6 +95,7 @@ VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
     },
     TargetVersion.PY39: {
         Feature.F_STRINGS,
     },
     TargetVersion.PY39: {
         Feature.F_STRINGS,

+        Feature.DEBUG_F_STRINGS,

         Feature.NUMERIC_UNDERSCORES,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.NUMERIC_UNDERSCORES,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,


@@ -106,6 +109,7 @@ VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
     },
     TargetVersion.PY310: {
         Feature.F_STRINGS,
     },
     TargetVersion.PY310: {
         Feature.F_STRINGS,

+        Feature.DEBUG_F_STRINGS,

         Feature.NUMERIC_UNDERSCORES,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.NUMERIC_UNDERSCORES,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,


@@ -120,6 +124,7 @@ VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
     },
     TargetVersion.PY311: {
         Feature.F_STRINGS,
     },
     TargetVersion.PY311: {
         Feature.F_STRINGS,

+        Feature.DEBUG_F_STRINGS,

         Feature.NUMERIC_UNDERSCORES,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,
         Feature.NUMERIC_UNDERSCORES,
         Feature.TRAILING_COMMA_IN_CALL,
         Feature.TRAILING_COMMA_IN_DEF,


@@ -132,6 +137,7 @@ VERSION_TO_FEATURES: Dict[TargetVersion, Set[Feature]] = {
         Feature.ANN_ASSIGN_EXTENDED_RHS,
         Feature.PATTERN_MATCHING,
         Feature.EXCEPT_STAR,
         Feature.ANN_ASSIGN_EXTENDED_RHS,
         Feature.PATTERN_MATCHING,
         Feature.EXCEPT_STAR,

+        Feature.VARIADIC_GENERICS,

     },
 }
 
     },
 }
 


@@ -143,11 +149,14 @@ def supports_feature(target_versions: Set[TargetVersion], feature: Feature) -> b
 class Preview(Enum):
     """Individual preview style features."""
 
 class Preview(Enum):
     """Individual preview style features."""
 

-    string_processing = auto()
-    remove_redundant_parens = auto()
-    one_element_subscript = auto()

     annotation_parens = auto()
     long_docstring_quotes_on_newline = auto()
     annotation_parens = auto()
     long_docstring_quotes_on_newline = auto()

+    normalize_docstring_quotes_and_prefixes_properly = auto()
+    one_element_subscript = auto()
+    remove_block_trailing_newline = auto()
+    remove_redundant_parens = auto()
+    string_processing = auto()
+    skip_magic_trailing_comma_in_subscript = auto()

 
 
 class Deprecated(UserWarning):
 
 
 class Deprecated(UserWarning):