X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/09915f4bd2d13652c089b9a96408b39116d82eb0..3a9d6f0a5f9013b97676f3d24246bd34d93fce4c:/plugin/black.vim?ds=sidebyside diff --git a/plugin/black.vim b/plugin/black.vim index 90d2047..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") @@ -50,12 +50,25 @@ if !exists("g:black_skip_string_normalization") 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_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 [ @@ -64,6 +77,7 @@ function BlackComplete(ArgLead, CmdLine, CursorPos) \ 'target_version=py37', \ 'target_version=py38', \ 'target_version=py39', +\ 'target_version=py310', \ ] endfunction