From fdadaed2ba93432add241bb25f9935dc2ebb4152 Mon Sep 17 00:00:00 2001 From: Horacio Sanson Date: Thu, 13 Apr 2023 08:54:49 +0900 Subject: Fix 4490 - Fix pyright not running with poetry (#4491) * Fix 4490 - Fix pyright not running with poetry * Fix tests --- ale_linters/python/pyright.vim | 2 +- test/linter/test_pyright.vader | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ale_linters/python/pyright.vim b/ale_linters/python/pyright.vim index ccade0c9..e41f7f14 100644 --- a/ale_linters/python/pyright.vim +++ b/ale_linters/python/pyright.vim @@ -65,7 +65,7 @@ endfunction function! ale_linters#python#pyright#GetCommand(buffer) abort let l:executable = ale_linters#python#pyright#GetExecutable(a:buffer) let l:exec_args = l:executable =~? 'pipenv\|poetry$' - \ ? ' run pyright' + \ ? ' run pyright-langserver' \ : '' let l:env_string = '' diff --git a/test/linter/test_pyright.vader b/test/linter/test_pyright.vader index 6730d135..45e9765e 100644 --- a/test/linter/test_pyright.vader +++ b/test/linter/test_pyright.vader @@ -148,14 +148,14 @@ Execute(virtualenv vars should be used when ale_python_auto_virtualenv = 1): \ . ale#Escape(b:executable) . ' --stdio' Assert !empty(ale#python#AutoVirtualenvEnvString(bufnr(''))) -Execute(Setting executable to 'pipenv' should append 'run pyright'): +Execute(Setting executable to 'pipenv' should append 'run pyright-langserver'): call ale#test#SetFilename('../test-files') let g:ale_python_pyright_executable = 'path/to/pipenv' GivenCommandOutput [] AssertLinter 'path/to/pipenv', - \ ale#Escape('path/to/pipenv') . ' run pyright --stdio' + \ ale#Escape('path/to/pipenv') . ' run pyright-langserver --stdio' Execute(Pipenv is detected when python_pyright_auto_pipenv is set): let g:ale_python_pyright_auto_pipenv = 1 @@ -163,14 +163,14 @@ Execute(Pipenv is detected when python_pyright_auto_pipenv is set): AssertLinterCwd ale#python#FindProjectRootIni(bufnr('')) AssertLinter 'pipenv', - \ ale#Escape('pipenv') . ' run pyright --stdio' + \ ale#Escape('pipenv') . ' run pyright-langserver --stdio' -Execute(Setting executable to 'poetry' should append 'run pyright'): +Execute(Setting executable to 'poetry' should append 'run pyright-langserver'): let g:ale_python_pyright_executable = 'path/to/poetry' GivenCommandOutput [] AssertLinter 'path/to/poetry', - \ ale#Escape('path/to/poetry') . ' run pyright --stdio' + \ ale#Escape('path/to/poetry') . ' run pyright-langserver --stdio' Execute(poetry is detected when python_pyright_auto_poetry is set): let g:ale_python_pyright_auto_poetry = 1 @@ -178,4 +178,4 @@ Execute(poetry is detected when python_pyright_auto_poetry is set): AssertLinterCwd ale#python#FindProjectRootIni(bufnr('')) AssertLinter 'poetry', - \ ale#Escape('poetry') . ' run pyright --stdio' + \ ale#Escape('poetry') . ' run pyright-langserver --stdio' -- cgit v1.2.3