From 2639ee82c503b8d87c2b3ff6b570d0c6ca8a338e Mon Sep 17 00:00:00 2001
From: Oliver Ford <dev@ojford.com>
Date: Wed, 28 Jul 2021 20:28:14 +0100
Subject: [PATCH] Switch python LSP server to maintained fork/continuation

The maintainer left Palantir org by the sounds of it; so just forked and
kept maintaining the project under a new org, nobody else at Palantir
taken it up: https://github.com/palantir/python-language-server/issues/935
---
 vim/.vimrc      | 2 +-
 vim/aconfmgr.sh | 7 ++++---
 vim/lsp.json    | 9 ++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/vim/.vimrc b/vim/.vimrc
index 0327d02d..0d4cd974 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -88,7 +88,7 @@ let g:LanguageClient_rootMarkers = {
 \ }
 let g:LanguageClient_serverCommands = {
 \ 'go': ['gopls'],
-\ 'python': ['pyls', '--log-file=/tmp/python-languageserver.log', '--verbose'],
+\ 'python': ['pylsp', '--log-file=/tmp/python-languageserver.log', '--verbose'],
 \ 'rust': ['rustup', 'run', 'stable', 'rls'],
 \ 'svelte': ['svelteserver', '--stdio'],
 \ 'terraform': ['terraform-ls', 'serve'],
diff --git a/vim/aconfmgr.sh b/vim/aconfmgr.sh
index ffbe4061..5b05642c 100644
--- a/vim/aconfmgr.sh
+++ b/vim/aconfmgr.sh
@@ -11,9 +11,10 @@ AddPackage python-pynvim
 # Language servers
 AddPackage gopls
 AddPackage --foreign nodejs-vls
-AddPackage python-language-server
-AddPackage --foreign python-language-server-black
-AddPackage --foreign pyls-mypy
+AddPackage python-lsp-server
+AddPackage --foreign python-lsp-black
+AddPackage --foreign python-mypy-ls
+AddPackage --foreign python-pyls-isort
 rustup component add rls
 AddPackage --foreign nodejs-svelte-language-server
 AddPackage --foreign terraform-ls
diff --git a/vim/lsp.json b/vim/lsp.json
index 68308e02..8504d860 100644
--- a/vim/lsp.json
+++ b/vim/lsp.json
@@ -1,8 +1,7 @@
 {
-  "pyls.plugins.autopep8.enabled": false,
-  "pyls.plugins.black.enabled": true,
-  "pyls.plugins.pyls_mypy.enabled": true,
-  "pyls.plugins.pyls_mypy.live_mode": true,
-  "pyls.plugins.yapf.enabled": false,
+  "pylsp.plugins.pylsp_black.enabled": true,
+  "pylsp.plugins.pylsp_mypy.enabled": true,
+  "pylsp.plugins.pylsp_mypy.live_mode": true,
+  "pylsp.plugins.yapf.enabled": false,
   "rust.clippy_preference": "on"
 }