Escape the pyls executable in the command, and support running virtualenv pyls executables

1 files changed, 9 insertions, 2 deletions

diff --git a/ale_linters/python/pyls.vim b/ale_linters/python/pyls.vim
index 1b91c2c7..9888853f 100644
--- a/ale_linters/python/pyls.vim
+++ b/ale_linters/python/pyls.vim
@@ -2,9 +2,16 @@
 " Description: A language server for Python
 
 call ale#Set('python_pyls_executable', 'pyls')
+call ale#Set('python_pyls_use_global', 0)
 
 function! ale_linters#python#pyls#GetExecutable(buffer) abort
-    return ale#Var(a:buffer, 'python_pyls_executable')
+    return ale#python#FindExecutable(a:buffer, 'python_pyls', ['pyls'])
+endfunction
+
+function! ale_linters#python#pyls#GetCommand(buffer) abort
+    let l:executable = ale_linters#python#pyls#GetExecutable(a:buffer)
+
+    return ale#Escape(l:executable)
 endfunction
 
 function! ale_linters#python#pyls#GetLanguage(buffer) abort
@@ -15,7 +22,7 @@ call ale#linter#Define('python', {
 \   'name': 'pyls',
 \   'lsp': 'stdio',
 \   'executable_callback': 'ale_linters#python#pyls#GetExecutable',
-\   'command_callback': 'ale_linters#python#pyls#GetExecutable',
+\   'command_callback': 'ale_linters#python#pyls#GetCommand',
 \   'language_callback': 'ale_linters#python#pyls#GetLanguage',
 \   'project_root_callback': 'ale#python#FindProjectRoot',
 \})