hasufell
/
ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #786 - Only set --no-local-style for yapf if a configuration file is detected

This commit is contained in:
w0rp 2017-07-20 11:07:07 +01:00
parent f133ce96f8
commit a5f754a5e0
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/ale/fixers/yapf.vim
View File

@ -17,10 +17,10 @@ function! ale#fixers#yapf#Fix(buffer) abort
let l:config = ale#path#FindNearestFile(a:buffer, '.style.yapf')
let l:config_options = !empty(l:config)
\ ? ' --style ' . ale#Escape(l:config)
\ ? ' --no-local-style --style ' . ale#Escape(l:config)
\ : ''
return {
\ 'command': ale#Escape(l:executable) . ' --no-local-style' . l:config_options,
\ 'command': ale#Escape(l:executable) . l:config_options,
\}
endfunction

0
test/command_callback/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf Normal file
View File

17
test/fixers/test_yapf_fixer_callback.vader
View File

@ -19,7 +19,20 @@ Execute(The yapf callback should return the correct default values):
\ 0,
\ ale#fixers#yapf#Fix(bufnr(''))
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py')
AssertEqual
\ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/yapf' --no-local-style" },
\ {'command': ale#Escape(g:dir . '/python_paths/with_virtualenv/env/bin/yapf')},
\ ale#fixers#yapf#Fix(bufnr(''))
\
Execute(The yapf should include the .style.yapf file if present):
call ale#test#SetFilename('python_paths/with_virtualenv/dir_with_yapf_config/foo/bar.py')
AssertEqual
\ {
\ 'command':
\ ale#Escape(g:dir . '/python_paths/with_virtualenv/env/bin/yapf')
\ . ' --no-local-style'
\ . ' --style ' . ale#Escape(g:dir . '/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf'),
\ },
\ ale#fixers#yapf#Fix(bufnr(''))