diff options
| author | w0rp <devw0rp@gmail.com> | 2017-07-20 11:07:07 +0100 |
|---|---|---|
| committer | w0rp <devw0rp@gmail.com> | 2017-07-20 11:07:07 +0100 |
| commit | a5f754a5e0271925cfcc3d5eb084863e7bf3a98c (patch) | |
| tree | c32e7845619ad954a7f70d9eefa58cfb1439a488 | |
| parent | f133ce96f8d0abc7d17bffa8b5317fccf3bbd347 (diff) | |
| download | ale-a5f754a5e0271925cfcc3d5eb084863e7bf3a98c.zip | |
Fix #786 - Only set --no-local-style for yapf if a configuration file is detected
| -rw-r--r-- | autoload/ale/fixers/yapf.vim | 4 | ||||
| -rw-r--r-- | test/command_callback/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf | 0 | ||||
| -rw-r--r-- | test/fixers/test_yapf_fixer_callback.vader | 17 |
3 files changed, 17 insertions, 4 deletions
diff --git a/autoload/ale/fixers/yapf.vim b/autoload/ale/fixers/yapf.vim index 7d6dfdcb..ba7453b8 100644 --- a/autoload/ale/fixers/yapf.vim +++ b/autoload/ale/fixers/yapf.vim @@ -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 diff --git a/test/command_callback/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf b/test/command_callback/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/test/command_callback/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf diff --git a/test/fixers/test_yapf_fixer_callback.vader b/test/fixers/test_yapf_fixer_callback.vader index 2653fd18..6edc2678 100644 --- a/test/fixers/test_yapf_fixer_callback.vader +++ b/test/fixers/test_yapf_fixer_callback.vader @@ -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': 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': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/yapf' --no-local-style" }, + \ { + \ '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('')) |