diff --git a/after/lsp/bashls.lua b/after/lsp/bashls.lua deleted file mode 100644 index 8aa4921..0000000 --- a/after/lsp/bashls.lua +++ /dev/null @@ -1,5 +0,0 @@ -local lsp_utils = require("lsp_utils") - -return { - capabilities = lsp_utils.get_default_capabilities(), -} diff --git a/after/lsp/clangd.lua b/after/lsp/clangd.lua index 189fd95..96016e7 100644 --- a/after/lsp/clangd.lua +++ b/after/lsp/clangd.lua @@ -1,9 +1,3 @@ -local lsp_utils = require("lsp_utils") - return { filetypes = { "c", "cpp", "cc" }, - flags = { - debounce_text_changes = 500, - }, - capabilities = lsp_utils.get_default_capabilities(), } diff --git a/after/lsp/ltex.lua b/after/lsp/ltex.lua index e488bc1..65da285 100644 --- a/after/lsp/ltex.lua +++ b/after/lsp/ltex.lua @@ -1,5 +1,3 @@ -local lsp_utils = require("lsp_utils") - return { filetypes = { "text", "plaintex", "tex", "markdown" }, settings = { @@ -7,6 +5,4 @@ return { language = "en", }, }, - flags = { debounce_text_changes = 300 }, - capabilities = lsp_utils.get_default_capabilities(), } diff --git a/after/lsp/lua_ls.lua b/after/lsp/lua_ls.lua index eae9a94..382ac7b 100644 --- a/after/lsp/lua_ls.lua +++ b/after/lsp/lua_ls.lua @@ -1,5 +1,3 @@ -local lsp_utils = require("lsp_utils") - -- settings for lua-language-server can be found on https://luals.github.io/wiki/settings/ return { settings = { @@ -13,5 +11,4 @@ return { }, }, }, - capabilities = lsp_utils.get_default_capabilities(), } diff --git a/after/lsp/pyright.lua b/after/lsp/pyright.lua index 8c5aa32..cd69e82 100644 --- a/after/lsp/pyright.lua +++ b/after/lsp/pyright.lua @@ -1,5 +1,3 @@ -local lsp_utils = require("lsp_utils") - -- For what diagnostic is enabled in which type checking mode, check doc: -- https://github.com/microsoft/pyright/blob/main/docs/configuration.md#diagnostic-settings-defaults -- Currently, the pyright also has some issues displaying hover documentation: @@ -21,9 +19,6 @@ local new_capability = { }, } -local capabilities = lsp_utils.get_default_capabilities() -local merged_capability = vim.tbl_deep_extend("force", capabilities, new_capability) - return { cmd = { "delance-langserver", "--stdio" }, settings = { @@ -52,5 +47,5 @@ return { }, }, }, - capabilities = merged_capability, + capabilities = new_capability, } diff --git a/after/lsp/ruff.lua b/after/lsp/ruff.lua index adf4e98..49120a9 100644 --- a/after/lsp/ruff.lua +++ b/after/lsp/ruff.lua @@ -1,5 +1,3 @@ -local lsp_utils = require("lsp_utils") - return { init_options = { -- the settings can be found here: https://docs.astral.sh/ruff/editors/settings/ @@ -7,5 +5,4 @@ return { organizeImports = true, }, }, - capabilities = lsp_utils.get_default_capabilities(), } diff --git a/after/lsp/vimls.lua b/after/lsp/vimls.lua deleted file mode 100644 index 950e44c..0000000 --- a/after/lsp/vimls.lua +++ /dev/null @@ -1,8 +0,0 @@ -local lsp_utils = require("lsp_utils") - -return { - flags = { - debounce_text_changes = 500, - }, - capabilities = lsp_utils.get_default_capabilities(), -} diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua index 0db9907..34fbdfd 100644 --- a/lua/config/lsp.lua +++ b/lua/config/lsp.lua @@ -74,6 +74,15 @@ vim.api.nvim_create_autocmd("LspAttach", { -- Enable lsp servers when they are available +local capabilities = require("lsp_utils").get_default_capabilities() + +vim.lsp.config("*", { + capabilities = capabilities, + flags = { + debounce_text_changes = 500, + }, +}) + -- A mapping from lsp server name to the executable name local enabled_lsp_servers = { pyright = "delance-langserver",