Vim plugin: allow using system black rather than virtualenv (#3309)

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

diff --git a/plugin/black.vim b/plugin/black.vim
index 3bdca62e6ad990650d3f8576948c0e39e9c6d1dd..543184e1cd4f373d3239cfdaf429c351e033b5eb 100644 (file)
--- a/plugin/black.vim
+++ b/plugin/black.vim
@@ -15,6 +15,10 @@
 "  1.2:
 "    - use autoload script
 
 "  1.2:
 "    - use autoload script
 

+if exists("g:load_black")
+  finish
+endif
+

 if v:version < 700 || !has('python3')
     func! __BLACK_MISSING()
         echo "The black.vim plugin requires vim7.0+ with Python 3.6 support."
 if v:version < 700 || !has('python3')
     func! __BLACK_MISSING()
         echo "The black.vim plugin requires vim7.0+ with Python 3.6 support."


@@ -25,10 +29,6 @@ if v:version < 700 || !has('python3')
     finish
 endif
 
     finish
 endif
 

-if exists("g:load_black")
-  finish
-endif
-

 let g:load_black = "py1.0"
 if !exists("g:black_virtualenv")
   if has("nvim")
 let g:load_black = "py1.0"
 if !exists("g:black_virtualenv")
   if has("nvim")


@@ -50,11 +50,37 @@ if !exists("g:black_skip_string_normalization")
     let g:black_skip_string_normalization = 0
   endif
 endif
     let g:black_skip_string_normalization = 0
   endif
 endif

+if !exists("g:black_skip_magic_trailing_comma")
+  if exists("g:black_magic_trailing_comma")
+    let g:black_skip_magic_trailing_comma = !g:black_magic_trailing_comma
+  else
+    let g:black_skip_magic_trailing_comma = 0
+  endif
+endif

 if !exists("g:black_quiet")
   let g:black_quiet = 0
 endif
 if !exists("g:black_quiet")
   let g:black_quiet = 0
 endif

+if !exists("g:black_target_version")
+  let g:black_target_version = ""
+endif
+if !exists("g:black_use_virtualenv")
+  let g:black_use_virtualenv = 1
+endif
+if !exists("g:black_preview")
+  let g:black_preview = 0
+endif

 
 

+function BlackComplete(ArgLead, CmdLine, CursorPos)
+  return [
+\    'target_version=py27',
+\    'target_version=py36',
+\    'target_version=py37',
+\    'target_version=py38',
+\    'target_version=py39',
+\    'target_version=py310',
+\  ]
+endfunction

 
 

-command! Black :call black#Black()
+command! -nargs=* -complete=customlist,BlackComplete Black :call black#Black(<f-args>)

 command! BlackUpgrade :call black#BlackUpgrade()
 command! BlackVersion :call black#BlackVersion()
 command! BlackUpgrade :call black#BlackUpgrade()
 command! BlackVersion :call black#BlackVersion()