56e67c5811
When set to true, and the buffer is currently inside a pipenv, GetExecutable will return "pipenv", which will trigger the existing functionality to append the correct pipenv arguments to run each linter. Defaults to false. I was going to implement ale#python#PipenvPresent by invoking `pipenv --venv` or `pipenv --where`, but it seemed to be abominably slow, even to the point where the test suite wasn't even finishing ("Tried to run tests 3 times"). The diff is: diff --git a/autoload/ale/python.vim b/autoload/ale/python.vim index 7baae079..8c100d41 100644 --- a/autoload/ale/python.vim +++ b/autoload/ale/python.vim @@ -106,5 +106,9 @@ endfunction " Detects whether a pipenv environment is present. function! ale#python#PipenvPresent(buffer) abort - return findfile('Pipfile.lock', expand('#' . a:buffer . ':p:h') . ';') isnot# '' + let l:cd_string = ale#path#BufferCdString(a:buffer) + let l:output = systemlist(l:cd_string . 'pipenv --where')[0] + " `pipenv --where` returns the path to the dir containing the Pipfile + " if in a pipenv, or some error text otherwise. + return strpart(l:output, 0, 18) !=# "No Pipfile present" endfunction Using vim's `findfile` is much faster, behaves correctly in the majority of situations, and also works reliably when the `pipenv` command doesn't exist.
34 lines
1.2 KiB
VimL
34 lines
1.2 KiB
VimL
" Author: dsifford <dereksifford@gmail.com>
|
|
" Description: A performant type-checker supporting LSP for Python 3 created by Facebook
|
|
|
|
call ale#Set('python_pyre_executable', 'pyre')
|
|
call ale#Set('python_pyre_use_global', get(g:, 'ale_use_global_executables', 0))
|
|
call ale#Set('python_pyre_auto_pipenv', 0)
|
|
|
|
function! ale_linters#python#pyre#GetExecutable(buffer) abort
|
|
if ale#Var(a:buffer, 'python_pyre_auto_pipenv') && ale#python#PipenvPresent(a:buffer)
|
|
return 'pipenv'
|
|
endif
|
|
|
|
return ale#python#FindExecutable(a:buffer, 'python_pyre', ['pyre'])
|
|
endfunction
|
|
|
|
function! ale_linters#python#pyre#GetCommand(buffer) abort
|
|
let l:executable = ale_linters#python#pyre#GetExecutable(a:buffer)
|
|
|
|
let l:exec_args = l:executable =~? 'pipenv$'
|
|
\ ? ' run pyre persistent'
|
|
\ : ' persistent'
|
|
|
|
return ale#Escape(l:executable) . l:exec_args
|
|
endfunction
|
|
|
|
call ale#linter#Define('python', {
|
|
\ 'name': 'pyre',
|
|
\ 'lsp': 'stdio',
|
|
\ 'executable_callback': 'ale_linters#python#pyre#GetExecutable',
|
|
\ 'command_callback': 'ale_linters#python#pyre#GetCommand',
|
|
\ 'project_root_callback': 'ale#python#FindProjectRoot',
|
|
\ 'completion_filter': 'ale#completion#python#CompletionItemFilter',
|
|
\})
|