Merge commit '882d8795c6ff65c02f2657e596391748d1b6b7f5'

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

diff --git a/.vim/bundle/black/plugin/black.vim b/.vim/bundle/black/plugin/black.vim
index 90d2047790b2ba2e916b4cae3e18518117334b01..543184e1cd4f373d3239cfdaf429c351e033b5eb 100644 (file)
--- a/.vim/bundle/black/plugin/black.vim
+++ b/.vim/bundle/black/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,12 +50,25 @@ 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_target_version")
   let g:black_target_version = ""
 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 [
 
 function BlackComplete(ArgLead, CmdLine, CursorPos)
   return [


@@ -64,6 +77,7 @@ function BlackComplete(ArgLead, CmdLine, CursorPos)
 \    'target_version=py37',
 \    'target_version=py38',
 \    'target_version=py39',
 \    'target_version=py37',
 \    'target_version=py38',
 \    'target_version=py39',

+\    'target_version=py310',

 \  ]
 endfunction
 
 \  ]
 endfunction