diff options
Diffstat (limited to 'ale_linters/python/pyright.vim')
| -rw-r--r-- | ale_linters/python/pyright.vim | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/ale_linters/python/pyright.vim b/ale_linters/python/pyright.vim index 5ce46600..f16af84c 100644 --- a/ale_linters/python/pyright.vim +++ b/ale_linters/python/pyright.vim @@ -1,5 +1,21 @@ +call ale#Set('python_pyright_use_global', get(g:, 'ale_use_global_executables', 0)) call ale#Set('python_pyright_executable', 'pyright-langserver') call ale#Set('python_pyright_config', {}) +call ale#Set('python_pyright_auto_pipenv', 0) +call ale#Set('python_pyright_auto_poetry', 0) + +" Force the cwd of the server to be the same as the project root to +" fix issues with treating local files matching first or third party library +" names being imported incorrectly. +function! ale_linters#python#pyright#GetCwd(buffer) abort + let l:fake_linter = { + \ 'name': 'pyright', + \ 'project_root': function('ale#python#FindProjectRoot'), + \} + let l:root = ale#lsp_linter#FindProjectRoot(a:buffer, l:fake_linter) + + return !empty(l:root) ? l:root : v:null +endfunction function! ale_linters#python#pyright#GetConfig(buffer) abort let l:config = deepcopy(ale#Var(a:buffer, 'python_pyright_config')) @@ -32,25 +48,36 @@ function! ale_linters#python#pyright#GetConfig(buffer) abort return l:config endfunction -" Force the cwd of the server to be the same as the project root to -" fix issues with treating local files matching first or third party library -" names being imported incorrectly. -function! ale_linters#python#pyright#GetCwd(buffer) abort - let l:fake_linter = { - \ 'name': 'pyright', - \ 'project_root': function('ale#python#FindProjectRoot'), - \} - let l:root = ale#lsp_linter#FindProjectRoot(a:buffer, l:fake_linter) +function! ale_linters#python#pyright#GetExecutable(buffer) abort + if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_pyright_auto_pipenv')) + \ && ale#python#PipenvPresent(a:buffer) + return 'pipenv' + endif - return !empty(l:root) ? l:root : v:null + if (ale#Var(a:buffer, 'python_auto_poetry') || ale#Var(a:buffer, 'python_pyright_auto_poetry')) + \ && ale#python#PoetryPresent(a:buffer) + return 'poetry' + endif + + return ale#python#FindExecutable(a:buffer, 'python_pyright', ['pyright-langserver']) +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' + \ : '' + + return ale#Escape(l:executable) . l:exec_args . ' --stdio' endfunction call ale#linter#Define('python', { \ 'name': 'pyright', \ 'lsp': 'stdio', -\ 'executable': {b -> ale#Var(b, 'python_pyright_executable')}, \ 'cwd': function('ale_linters#python#pyright#GetCwd'), -\ 'command': '%e --stdio', +\ 'executable': function('ale_linters#python#pyright#GetExecutable'), +\ 'command': function('ale_linters#python#pyright#GetCommand'), \ 'project_root': function('ale#python#FindProjectRoot'), \ 'completion_filter': 'ale#completion#python#CompletionItemFilter', \ 'lsp_config': function('ale_linters#python#pyright#GetConfig'), |