mirror of https://github.com/dense-analysis/ale
Use pipenv isort executable when python_auto_pipenv = 1
This commit is contained in:
parent
681a6e371d
commit
373ffa0f31
|
@ -5,14 +5,23 @@ call ale#Set('python_isort_executable', 'isort')
|
||||||
call ale#Set('python_isort_options', '')
|
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#GetExecutable(buffer) abort
|
||||||
|
if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_isort_auto_pipenv'))
|
||||||
|
\ && ale#python#PipenvPresent(a:buffer)
|
||||||
|
return 'pipenv'
|
||||||
|
endif
|
||||||
|
|
||||||
|
return ale#python#FindExecutable(a:buffer, 'python_isort', ['isort'])
|
||||||
|
endfunction
|
||||||
|
|
||||||
function! ale#fixers#isort#Fix(buffer) abort
|
function! ale#fixers#isort#Fix(buffer) abort
|
||||||
let l:options = ale#Var(a:buffer, 'python_isort_options')
|
let l:options = ale#Var(a:buffer, 'python_isort_options')
|
||||||
|
|
||||||
let l:executable = ale#python#FindExecutable(
|
let l:executable = ale#fixers#isort#GetExecutable(a:buffer)
|
||||||
\ a:buffer,
|
|
||||||
\ 'python_isort',
|
let l:exec_args = l:executable =~? 'pipenv$'
|
||||||
\ ['isort'],
|
\ ? ' run isort'
|
||||||
\)
|
\ : ''
|
||||||
|
|
||||||
if !executable(l:executable)
|
if !executable(l:executable)
|
||||||
return 0
|
return 0
|
||||||
|
@ -20,6 +29,7 @@ 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) . (!empty(l:options) ? ' ' . l:options : '') . ' -',
|
\ . ale#Escape(l:executable) . l:exec_args
|
||||||
|
\ . (!empty(l:options) ? ' ' . l:options : '') . ' -',
|
||||||
\}
|
\}
|
||||||
endfunction
|
endfunction
|
||||||
|
|
Loading…
Reference in New Issue