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.
47 lines
1.5 KiB
Text
47 lines
1.5 KiB
Text
Before:
|
|
call ale#assert#SetUpLinterTest('python', 'pyls')
|
|
|
|
let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
|
|
|
|
After:
|
|
unlet! b:bin_dir
|
|
unlet! b:executable
|
|
|
|
call ale#assert#TearDownLinterTest()
|
|
|
|
Execute(The pyls command callback should return default string):
|
|
AssertLinter 'pyls', ale#Escape('pyls')
|
|
|
|
Execute(The pyls executable should be configurable):
|
|
let g:ale_python_pyls_executable = '~/.local/bin/pyls'
|
|
|
|
AssertLinter '~/.local/bin/pyls' , ale#Escape('~/.local/bin/pyls')
|
|
|
|
Execute(The pyls executable should be run from the virtualenv path):
|
|
call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py')
|
|
|
|
let b:executable = ale#path#Simplify(
|
|
\ g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/pyls'
|
|
\)
|
|
|
|
AssertEqual ale#Escape(b:executable),
|
|
\ ale_linters#python#pyls#GetCommand(bufnr(''))
|
|
|
|
Execute(You should be able to override the pyls virtualenv lookup):
|
|
call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py')
|
|
|
|
let g:ale_python_pyls_use_global = 1
|
|
|
|
AssertLinter 'pyls', ale#Escape('pyls')
|
|
|
|
Execute(Setting executable to 'pipenv' appends 'run pyls'):
|
|
let g:ale_python_pyls_executable = 'path/to/pipenv'
|
|
|
|
AssertLinter 'path/to/pipenv', ale#Escape('path/to/pipenv') . ' run pyls'
|
|
|
|
Execute(Pipenv is detected when python_pyls_auto_pipenv is set):
|
|
let g:ale_python_pyls_auto_pipenv = 1
|
|
call ale#test#SetFilename('/testplugin/test/python_fixtures/pipenv/whatever.py')
|
|
|
|
AssertLinter 'pipenv',
|
|
\ ale#Escape('pipenv') . ' run pyls'
|