From 52563f91816f86fbc3e6d9f01ca50a8d85fdbee5 Mon Sep 17 00:00:00 2001 From: Buck Evan Date: Sun, 4 Jul 2021 05:15:37 -0700 Subject: black fixer: --pyi option was appended without a space (#3759) --- autoload/ale/fixers/black.vim | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'autoload') diff --git a/autoload/ale/fixers/black.vim b/autoload/ale/fixers/black.vim index 17697652..142cd983 100644 --- a/autoload/ale/fixers/black.vim +++ b/autoload/ale/fixers/black.vim @@ -18,20 +18,25 @@ endfunction function! ale#fixers#black#Fix(buffer) abort let l:executable = ale#fixers#black#GetExecutable(a:buffer) - let l:exec_args = l:executable =~? 'pipenv$' - \ ? ' run black' - \ : '' + let l:cmd = [ale#Escape(l:executable)] + + if l:executable =~? 'pipenv$' + call extend(l:cmd, ['run', 'black']) + endif + let l:options = ale#Var(a:buffer, 'python_black_options') + if !empty(l:options) + call add(l:cmd, l:options) + endif + if expand('#' . a:buffer . ':e') is? 'pyi' - let l:options .= '--pyi' + call add(l:cmd, '--pyi') endif - let l:result = { - \ 'command': ale#Escape(l:executable) . l:exec_args - \ . (!empty(l:options) ? ' ' . l:options : '') - \ . ' -', - \} + call add(l:cmd, '-') + + let l:result = {'command': join(l:cmd, ' ')} if ale#Var(a:buffer, 'python_black_change_directory') let l:result.cwd = '%s:h' -- cgit v1.2.3