Improve Python 2 only syntax detection (GH-2592)

[etc/vim.git] / autoload / black.vim

diff --git a/autoload/black.vim b/autoload/black.vim
index 0d93aa899d07f94de2c5498c49c06813617479a9..9ff5c2341fe71d7920aa8a35fbbdcb9496a40e66 100644 (file)
--- a/autoload/black.vim
+++ b/autoload/black.vim
@@ -22,7 +22,7 @@ class Flag(collections.namedtuple("FlagBase", "name, cast")):
 FLAGS = [
   Flag(name="line_length", cast=int),
   Flag(name="fast", cast=strtobool),
 FLAGS = [
   Flag(name="line_length", cast=int),
   Flag(name="fast", cast=strtobool),

-  Flag(name="string_normalization", cast=strtobool),
+  Flag(name="skip_string_normalization", cast=strtobool),

   Flag(name="quiet", cast=strtobool),
 ]
 
   Flag(name="quiet", cast=strtobool),
 ]
 


@@ -98,13 +98,47 @@ if _initialize_black_env():
   import black
   import time
 
   import black
   import time
 

-def Black():
+def get_target_version(tv):
+  if isinstance(tv, black.TargetVersion):
+    return tv
+  ret = None
+  try:
+    ret = black.TargetVersion[tv.upper()]
+  except KeyError:
+    print(f"WARNING: Target version {tv!r} not recognized by Black, using default target")
+  return ret
+
+def Black(**kwargs):
+  """
+  kwargs allows you to override ``target_versions`` argument of
+  ``black.FileMode``.
+
+  ``target_version`` needs to be cleaned because ``black.FileMode``
+  expects the ``target_versions`` argument to be a set of TargetVersion enums.
+
+  Allow kwargs["target_version"] to be a string to allow
+  to type it more quickly.
+
+  Using also target_version instead of target_versions to remain
+  consistent to Black's documentation of the structure of pyproject.toml.
+  """

   start = time.time()
   configs = get_configs()
   start = time.time()
   configs = get_configs()

+
+  black_kwargs = {}
+  if "target_version" in kwargs:
+    target_version = kwargs["target_version"]
+
+    if not isinstance(target_version, (list, set)):
+      target_version = [target_version]
+    target_version = set(filter(lambda x: x, map(lambda tv: get_target_version(tv), target_version)))
+    black_kwargs["target_versions"] = target_version
+

   mode = black.FileMode(
     line_length=configs["line_length"],
   mode = black.FileMode(
     line_length=configs["line_length"],

-    string_normalization=configs["string_normalization"],
+    string_normalization=not configs["skip_string_normalization"],

     is_pyi=vim.current.buffer.name.endswith('.pyi'),
     is_pyi=vim.current.buffer.name.endswith('.pyi'),

+    **black_kwargs,

   )
   quiet = configs["quiet"]
 
   )
   quiet = configs["quiet"]
 


@@ -147,7 +181,7 @@ def get_configs():
     toml_config = {}
 
   return {
     toml_config = {}
 
   return {

-    flag.var_name: flag.cast(toml_config.get(flag.name, vim.eval(flag.vim_rc_name)))
+    flag.var_name: toml_config.get(flag.name, flag.cast(vim.eval(flag.vim_rc_name)))

     for flag in FLAGS
   }
 
     for flag in FLAGS
   }
 


@@ -160,8 +194,17 @@ def BlackVersion():
 
 EndPython3
 
 
 EndPython3
 

-function black#Black()
-  :py3 Black()
+function black#Black(...)
+    let kwargs = {}
+    for arg in a:000
+        let arg_list = split(arg, '=')
+        let kwargs[arg_list[0]] = arg_list[1]
+    endfor
+python3 << EOF
+import vim
+kwargs = vim.eval("kwargs")
+EOF
+  :py3 Black(**kwargs)

 endfunction
 
 function black#BlackUpgrade()
 endfunction
 
 function black#BlackUpgrade()