diff options
| -rwxr-xr-x | docs/Nvim_setup.sh | 2 | ||||
| -rw-r--r-- | docs/README.md | 8 | ||||
| -rw-r--r-- | 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 cf793d6..cb66300 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 432b997..2f47a65 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 a9b7c76..3271fd4 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, |