Search python fixers in virtual environment (#632)

* Search python fixers in virtual environment

* Add tests for python fixers
This commit is contained in:
José Luis Lafuente 2017-06-07 21:42:30 +02:00 committed by w0rp
parent f61c6d4c0e
commit 1eec446620
8 changed files with 97 additions and 3 deletions

View File

@ -2,7 +2,12 @@
" Description: Fixing files with autopep8.
function! ale#fixers#autopep8#Fix(buffer) abort
let l:executable = ale#handlers#python#GetExecutable(a:buffer, 'autopep8')
if empty(l:executable)
return 0
endif
return {
\ 'command': 'autopep8 -'
\ 'command': ale#Escape(l:executable) . ' -'
\}
endfunction

View File

@ -2,12 +2,17 @@
" Description: Fixing Python imports with isort.
function! ale#fixers#isort#Fix(buffer) abort
let l:executable = ale#handlers#python#GetExecutable(a:buffer, 'isort')
if empty(l:executable)
return 0
endif
let l:config = ale#path#FindNearestFile(a:buffer, '.isort.cfg')
let l:config_options = !empty(l:config)
\ ? ' --settings-path ' . ale#Escape(l:config)
\ : ''
return {
\ 'command': 'isort' . l:config_options . ' -',
\ 'command': ale#Escape(l:executable) . l:config_options . ' -',
\}
endfunction

View File

@ -2,12 +2,17 @@
" Description: Fixing Python files with yapf.
function! ale#fixers#yapf#Fix(buffer) abort
let l:executable = ale#handlers#python#GetExecutable(a:buffer, 'yapf')
if empty(l:executable)
return 0
endif
let l:config = ale#path#FindNearestFile(a:buffer, '.style.yapf')
let l:config_options = !empty(l:config)
\ ? ' --style ' . ale#Escape(l:config)
\ : ''
return {
\ 'command': 'yapf --no-local-style' . l:config_options,
\ 'command': ale#Escape(l:executable) . ' --no-local-style' . l:config_options,
\}
endfunction

View File

@ -45,3 +45,24 @@ function! ale#handlers#python#HandlePEP8Format(buffer, lines) abort
return l:output
endfunction
" Given a buffer number and a command name, find the path to the executable.
" First search on a virtualenv for Python, if nothing is found, try the global
" command. Returns an empty string if cannot find the executable
function! ale#handlers#python#GetExecutable(buffer, cmd_name) abort
let l:virtualenv = ale#python#FindVirtualenv(a:buffer)
if !empty(l:virtualenv)
let l:ve_executable = l:virtualenv . '/bin/' . a:cmd_name
if executable(l:ve_executable)
return l:ve_executable
endif
endif
if executable(a:cmd_name)
return a:cmd_name
endif
return ''
endfunction

View File

@ -0,0 +1,58 @@
Before:
silent! execute 'cd /testplugin/test/command_callback'
let g:dir = getcwd()
After:
" Set the file to something else,
" or we'll cause issues when running other tests
silent file 'dummy.py'
unlet! g:dir
Execute(The python GetExecutable callbacks should return the correct path):
AssertEqual
\ '',
\ ale#handlers#python#GetExecutable(bufnr(''), 'isort')
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
AssertEqual
\ g:dir . '/python_paths/with_virtualenv/env/bin/isort',
\ ale#handlers#python#GetExecutable(bufnr(''), 'isort')
AssertEqual
\ g:dir . '/python_paths/with_virtualenv/env/bin/autopep8',
\ ale#handlers#python#GetExecutable(bufnr(''), 'autopep8')
AssertEqual
\ g:dir . '/python_paths/with_virtualenv/env/bin/yapf',
\ ale#handlers#python#GetExecutable(bufnr(''), 'yapf')
Execute(The autopep8 callbacks should return the correct default values):
AssertEqual
\ 0,
\ ale#fixers#autopep8#Fix(bufnr(''))
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
AssertEqual
\ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/autopep8' -" },
\ ale#fixers#autopep8#Fix(bufnr(''))
Execute(The isort callbacks should return the correct default values):
AssertEqual
\ 0,
\ ale#fixers#isort#Fix(bufnr(''))
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
AssertEqual
\ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/isort' -" },
\ ale#fixers#isort#Fix(bufnr(''))
Execute(The yapf callbacks should return the correct default values):
AssertEqual
\ 0,
\ ale#fixers#yapf#Fix(bufnr(''))
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
AssertEqual
\ {'command': "'" . g:dir . "/python_paths/with_virtualenv/env/bin/yapf' --no-local-style" },
\ ale#fixers#yapf#Fix(bufnr(''))