forks/ale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#335 Detect flake8 in vritualenv, and escape the executable path

Browse source
This commit is contained in:
w0rp 2017-05-07 16:16:17 +01:00
parent 02f6fba6cb
commit 4228c503f4
4 changed files with 109 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ale_linters/python/flake8.vim
View file

@ -8,15 +8,32 @@ let g:ale_python_flake8_executable =
let s:default_options = get(g:, 'ale_python_flake8_args', '')
let g:ale_python_flake8_options =
\ get(g:, 'ale_python_flake8_options', s:default_options)
let g:ale_python_flake8_use_global = get(g:, 'ale_python_flake8_use_global', 0)
" A map from Python executable paths to semver strings parsed for those
" executables, so we don't have to look up the version number constantly.
let s:version_cache = {}
function! ale_linters#python#flake8#GetExecutable(buffer) abort
if !ale#Var(a:buffer, 'python_flake8_use_global')
let l:virtualenv = ale#python#FindVirtualenv(a:buffer)
if !empty(l:virtualenv)
let l:ve_flake8 = l:virtualenv . '/bin/flake8'
if executable(l:ve_flake8)
return l:ve_flake8
endif
endif
endif
return ale#Var(a:buffer, 'python_flake8_executable')
endfunction
function! ale_linters#python#flake8#ClearVersionCache() abort
let s:version_cache = {}
endfunction
function! ale_linters#python#flake8#VersionCheck(buffer) abort
let l:executable = ale_linters#python#flake8#GetExecutable(a:buffer)
@ -27,7 +44,8 @@ function! ale_linters#python#flake8#VersionCheck(buffer) abort
return ''
endif
return ale_linters#python#flake8#GetExecutable(a:buffer) . ' --version'
return fnameescape(ale_linters#python#flake8#GetExecutable(a:buffer))
\ . ' --version'
endfunction
" Get the flake8 version from the output, or the cache.
@ -60,12 +78,14 @@ function! ale_linters#python#flake8#GetCommand(buffer, version_output) abort
" Only include the --stdin-display-name argument if we can parse the
" flake8 version, and it is recent enough to support it.
let l:display_name_args = s:SupportsDisplayName(l:version)
\ ? '--stdin-display-name %s'
\ ? ' --stdin-display-name %s'
\ : ''
return ale_linters#python#flake8#GetExecutable(a:buffer)
\ . ' ' . ale#Var(a:buffer, 'python_flake8_options')
\ . ' ' . l:display_name_args . ' -'
let l:options = ale#Var(a:buffer, 'python_flake8_options')
return fnameescape(ale_linters#python#flake8#GetExecutable(a:buffer))
\ . (!empty(l:options) ? ' ' . l:options : '')
\ . l:display_name_args . ' -'
endfunction
call ale#linter#Define('python', {