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

address code review issues

Browse Source
This commit is contained in:
Derek P Sifford 2018-07-04 21:16:57 -04:00
parent 3251d95a91
commit 6dc69b2144
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/ale/fixers/isort.vim
View File

@ -2,6 +2,7 @@
" Description: Fixing Python imports with isort. " Description: Fixing Python imports with isort.
call ale#Set('python_isort_executable', 'isort') call ale#Set('python_isort_executable', 'isort')
call ale#Set('python_isort_options', '')
call ale#Set('python_isort_use_global', get(g:, 'ale_use_global_executables', 0)) call ale#Set('python_isort_use_global', get(g:, 'ale_use_global_executables', 0))
function! ale#fixers#isort#Fix(buffer) abort function! ale#fixers#isort#Fix(buffer) abort
@ -19,6 +20,6 @@ function! ale#fixers#isort#Fix(buffer) abort
return { return {
\ 'command': ale#path#BufferCdString(a:buffer) \ 'command': ale#path#BufferCdString(a:buffer)
\ . ale#Escape(l:executable) . ' ' . l:options . ' -', \ . ale#Escape(l:executable) . (!empty(l:options) ? ' ' . l:options : '') . ' -',
\} \}
endfunction endfunction

17
test/fixers/test_isort_fixer_callback.vader
View File

@ -1,5 +1,6 @@
Before: Before:
Save g:ale_python_isort_executable Save g:ale_python_isort_executable
Save g:ale_python_isort_options
" Use an invalid global executable, so we don't match it. " Use an invalid global executable, so we don't match it.
let g:ale_python_isort_executable = 'xxxinvalid' let g:ale_python_isort_executable = 'xxxinvalid'
@ -30,3 +31,19 @@ Execute(The isort callback should return the correct default values):
\ . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/isort')) . ' -', \ . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/isort')) . ' -',
\ }, \ },
\ ale#fixers#isort#Fix(bufnr('')) \ ale#fixers#isort#Fix(bufnr(''))
Execute(The isort callback should respect custom options):
let g:ale_python_isort_options = '--multi-line=3 --trailing-comma'
AssertEqual
\ 0,
\ ale#fixers#isort#Fix(bufnr(''))
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
AssertEqual
\ {
\ 'command': 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir/foo')) . ' && '
\ . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/isort'))
\ . ' --multi-line=3 --trailing-comma -',
\ },
\ ale#fixers#isort#Fix(bufnr(''))