X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/5446a92f0161e398de765bf9532d8c76c5652333..e712e48e06420d9240ce95c81acfcf6f11d14c83:/plugin/black.vim diff --git a/plugin/black.vim b/plugin/black.vim index b5edb2a..543184e 100644 --- a/plugin/black.vim +++ b/plugin/black.vim @@ -15,6 +15,10 @@ " 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." @@ -25,10 +29,6 @@ if v:version < 700 || !has('python3') finish endif -if exists("g:load_black") - finish -endif - let g:load_black = "py1.0" if !exists("g:black_virtualenv") if has("nvim") @@ -43,18 +43,44 @@ endif if !exists("g:black_linelength") let g:black_linelength = 88 endif -if !exists("g:black_string_normalization") - if exists("g:black_skip_string_normalization") - let g:black_string_normalization = !g:black_skip_string_normalization +if !exists("g:black_skip_string_normalization") + if exists("g:black_string_normalization") + let g:black_skip_string_normalization = !g:black_string_normalization + else + 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_string_normalization = 1 + 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_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() command! BlackUpgrade :call black#BlackUpgrade() command! BlackVersion :call black#BlackVersion()