From 56e67c5811024ef25e1d8792193c725241bdc04b Mon Sep 17 00:00:00 2001 From: Eddie Lebow Date: Wed, 11 Jul 2018 23:02:23 -0400 Subject: Add python_[linter]_auto_pipenv options for python linters (fixes #1656) 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. --- ale_linters/python/prospector.vim | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ale_linters/python/prospector.vim') diff --git a/ale_linters/python/prospector.vim b/ale_linters/python/prospector.vim index fff37147..622d3d68 100644 --- a/ale_linters/python/prospector.vim +++ b/ale_linters/python/prospector.vim @@ -1,6 +1,8 @@ " Author: chocoelho " Description: prospector linter python files +call ale#Set('python_prospector_auto_pipenv', 0) + let g:ale_python_prospector_executable = \ get(g:, 'ale_python_prospector_executable', 'prospector') @@ -10,6 +12,10 @@ let g:ale_python_prospector_options = let g:ale_python_prospector_use_global = get(g:, 'ale_python_prospector_use_global', get(g:, 'ale_use_global_executables', 0)) function! ale_linters#python#prospector#GetExecutable(buffer) abort + if ale#Var(a:buffer, 'python_prospector_auto_pipenv') && ale#python#PipenvPresent(a:buffer) + return 'pipenv' + endif + return ale#python#FindExecutable(a:buffer, 'python_prospector', ['prospector']) endfunction -- cgit v1.2.3 From dbe93529352880068cb738abb93a1bc009bf73ed Mon Sep 17 00:00:00 2001 From: Eddie Lebow Date: Sat, 15 Sep 2018 21:38:26 -0400 Subject: Add `python_auto_pipenv` config var for all python linters. This allows a user to set one variable instead of eight. --- ale_linters/python/prospector.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ale_linters/python/prospector.vim') diff --git a/ale_linters/python/prospector.vim b/ale_linters/python/prospector.vim index 622d3d68..b01cec87 100644 --- a/ale_linters/python/prospector.vim +++ b/ale_linters/python/prospector.vim @@ -12,7 +12,8 @@ let g:ale_python_prospector_options = let g:ale_python_prospector_use_global = get(g:, 'ale_python_prospector_use_global', get(g:, 'ale_use_global_executables', 0)) function! ale_linters#python#prospector#GetExecutable(buffer) abort - if ale#Var(a:buffer, 'python_prospector_auto_pipenv') && ale#python#PipenvPresent(a:buffer) + if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_prospector_auto_pipenv')) + \ && ale#python#PipenvPresent(a:buffer) return 'pipenv' endif -- cgit v1.2.3