From ffb0601aca630d33adc84606db54aca3a5484e72 Mon Sep 17 00:00:00 2001
From: jdhao <jdhao@hotmail.com>
Date: Thu, 15 Jul 2021 23:33:02 +0800
Subject: [PATCH] Use pylsp instead of pyls

It seems that pyls, the original python language server has lost its
momentum, and pylsp is a community driven fork of pyls. So
nvim-lspconfig has dropped support for pyls in https://github.com/neovim/nvim-lspconfig/pull/1074.
See also https://github.com/palantir/python-language-server/issues/935
and https://github.com/python-lsp/python-lsp-server/issues/27.
---
 docs/Nvim_setup.sh |  2 +-
 docs/README.md     |  8 ++++----
 lua/config/lsp.lua | 13 ++++++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/Nvim_setup.sh b/docs/Nvim_setup.sh
index cf793d6b..cb663007 100755
--- a/docs/Nvim_setup.sh
+++ b/docs/Nvim_setup.sh
@@ -68,7 +68,7 @@ fi
 
 # Install some Python packages used by Neovim plugins.
 echo "Installing Python packages"
-declare -a py_packages=("pynvim" 'python-language-server[all]' "black" "vim-vint" "pyls-isort" "pyls-mypy")
+declare -a py_packages=("pynvim" 'python-lsp-server[all]' "black" "vim-vint" "pyls-isort" "pylsp-mypy")
 
 if [[ "$SYSTEM_PYTHON" = true ]]; then
     echo "Using system Python to install $(PY_PACKAGES)"
diff --git a/docs/README.md b/docs/README.md
index 432b997f..2f47a658 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -20,13 +20,13 @@ plugins that utilize its Python binding. Pynvim is required by plugins such as
 pip install -U pynvim
 ```
 
-## pyls
+## python-lsp-server
 
-[Pyls](https://github.com/palantir/python-language-server) is a Python Language
-Server for completion, linting, go to definition, etc.
+[python-lsp-server](https://github.com/python-lsp/python-lsp-server) is the community-fork of pyls, and it is a Python Language Server for completion,
+linting, go to definition, etc.
 
 ```
-pip install "python-language-server[all]" pyls-isort pyls-mypy
+pip install 'python-lsp-server[all]' pylsp-mypy pyls-isort
 ```
 
 ## Git
diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua
index a9b7c760..3271fd45 100644
--- a/lua/config/lsp.lua
+++ b/lua/config/lsp.lua
@@ -57,26 +57,29 @@ capabilities.textDocument.completion.completionItem.snippetSupport = true
 
 local lspconfig = require("lspconfig")
 
-lspconfig.pyls.setup{
+lspconfig.pylsp.setup{
   on_attach = on_attach,
   settings = {
-    pyls = {
+    pylsp = {
       plugins = {
-        flake8 = {enabled = false},
         pylint = {enabled = true, executable = "pylint"},
         pyflakes = {enabled = false},
         pycodestyle = {enabled = false},
         jedi_completion = {fuzzy = true},
         pyls_isort = {enabled = true},
-        pyls_mypy = {enabled = true}
+        pylsp_mypy = {enabled = true}
       }
     }
   },
   flags = {
-    debounce_text_changes = 500,
+    debounce_text_changes = 200,
   }
 }
 
+-- lspconfig.pyright.setup{
+--   on_attach = on_attach,
+-- }
+
 lspconfig.clangd.setup{
   on_attach = on_attach,
   capabilities = capabilities,