From 8b73d98baf0a185886a55a62b8b32f6543f14af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerardo=20G=C3=B3mez=20Rodr=C3=ADguez?=
 <gerardo.gomez@tutanota.com>
Date: Fri, 9 Jul 2021 16:40:31 +0300
Subject: chore: replace python-language-server to supported pylsp (#3810)

As mentioned in #3722 palantir's python-language-server is no longer maintained.
The alternative is to use the community-driven https://github.com/python-lsp/python-lsp-server.
---
 ale_linters/python/pyls.vim  | 37 -------------------------------------
 ale_linters/python/pylsp.vim | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 ale_linters/python/pyls.vim
 create mode 100644 ale_linters/python/pylsp.vim

(limited to 'ale_linters/python')

diff --git a/ale_linters/python/pyls.vim b/ale_linters/python/pyls.vim
deleted file mode 100644
index 10304b2c..00000000
--- a/ale_linters/python/pyls.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" Author: aurieh <me@aurieh.me>
-" Description: A language server for Python
-
-call ale#Set('python_pyls_executable', 'pyls')
-call ale#Set('python_pyls_options', '')
-call ale#Set('python_pyls_use_global', get(g:, 'ale_use_global_executables', 0))
-call ale#Set('python_pyls_auto_pipenv', 0)
-call ale#Set('python_pyls_config', {})
-
-function! ale_linters#python#pyls#GetExecutable(buffer) abort
-    if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_pyls_auto_pipenv'))
-    \ && ale#python#PipenvPresent(a:buffer)
-        return 'pipenv'
-    endif
-
-    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)
-
-    let l:exec_args = l:executable =~? 'pipenv$'
-    \   ? ' run pyls'
-    \   : ''
-
-    return ale#Escape(l:executable) . l:exec_args . ale#Pad(ale#Var(a:buffer, 'python_pyls_options'))
-endfunction
-
-call ale#linter#Define('python', {
-\   'name': 'pyls',
-\   'lsp': 'stdio',
-\   'executable': function('ale_linters#python#pyls#GetExecutable'),
-\   'command': function('ale_linters#python#pyls#GetCommand'),
-\   'project_root': function('ale#python#FindProjectRoot'),
-\   'completion_filter': 'ale#completion#python#CompletionItemFilter',
-\   'lsp_config': {b -> ale#Var(b, 'python_pyls_config')},
-\})
diff --git a/ale_linters/python/pylsp.vim b/ale_linters/python/pylsp.vim
new file mode 100644
index 00000000..4c6ac16d
--- /dev/null
+++ b/ale_linters/python/pylsp.vim
@@ -0,0 +1,37 @@
+" Author: aurieh <me@aurieh.me>
+" Description: A language server for Python
+
+call ale#Set('python_pylsp_executable', 'pylsp')
+call ale#Set('python_pylsp_options', '')
+call ale#Set('python_pylsp_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('python_pylsp_auto_pipenv', 0)
+call ale#Set('python_pylsp_config', {})
+
+function! ale_linters#python#pylsp#GetExecutable(buffer) abort
+    if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_pylsp_auto_pipenv'))
+    \ && ale#python#PipenvPresent(a:buffer)
+        return 'pipenv'
+    endif
+
+    return ale#python#FindExecutable(a:buffer, 'python_pylsp', ['pylsp'])
+endfunction
+
+function! ale_linters#python#pylsp#GetCommand(buffer) abort
+    let l:executable = ale_linters#python#pylsp#GetExecutable(a:buffer)
+
+    let l:exec_args = l:executable =~? 'pipenv$'
+    \   ? ' run pylsp'
+    \   : ''
+
+    return ale#Escape(l:executable) . l:exec_args . ale#Pad(ale#Var(a:buffer, 'python_pylsp_options'))
+endfunction
+
+call ale#linter#Define('python', {
+\   'name': 'pylsp',
+\   'lsp': 'stdio',
+\   'executable': function('ale_linters#python#pylsp#GetExecutable'),
+\   'command': function('ale_linters#python#pylsp#GetCommand'),
+\   'project_root': function('ale#python#FindProjectRoot'),
+\   'completion_filter': 'ale#completion#python#CompletionItemFilter',
+\   'lsp_config': {b -> ale#Var(b, 'python_pylsp_config')},
+\})
-- 
cgit v1.2.3