feat!: move all vim.lsp.config to a config table for more general support

Author: mehalter

README.md

@@ -89,14 +89,24 @@ local opts = {
       desc = "Format file with LSP",
     },
   },
-  -- Configure default capabilities for all language servers (`:h vim.lsp.protocol.make_client.capabilities()`)
-  capabilities = {
-    textDocument = {
-      foldingRange = { dynamicRegistration = false },
+  -- Configure language servers with `vim.lsp.config` (`:h vim.lsp.config`)
+  config = {
+    -- Configure LSP defaults
+    ["*"] = {
+      -- Configure default capabilities
+      capabilities = {
+        textDocument = {
+          foldingRange = { dynamicRegistration = false },
+        },
+      },
+      -- Custom flags table to be passed to all language servers
+      flags = {
+        exit_timeout = 5000,
+      },
     },
   },
   defaults = {
-    hover = { border = "rounded", silent = true } -- customize lsp hover window
+    hover = { border = "rounded", silent = true }, -- customize lsp hover window
     signature_help = false, -- disable any default customizations
   },
   -- Configuration of LSP file operation functionality
@@ -113,10 +123,6 @@ local opts = {
       didDelete = true,
     },
   },
-  -- A custom flags table to be passed to all language servers  (`:h lspconfig-setup`)
-  flags = {
-    exit_timeout = 5000,
-  },
   -- Configuration options for controlling formatting with language servers
   formatting = {
     -- control auto formatting on save
@@ -146,7 +152,7 @@ local opts = {
     -- default handler uses key "*"
     ["*"] = vim.lsp.enable,
     -- custom function handler for pyright
-    pyright = function() vim.lsp.enable("pyright") end,
+    pyright = function() vim.lsp.enable "pyright" end,
     -- set to false to disable the setup of a language server
     rust_analyzer = false,
   },

lua/astrolsp/config.lua

@@ -121,17 +121,22 @@
 ---}
 ---```
 ---@field features AstroLSPFeatureOpts?
----Configure default capabilities for language servers (`:h vim.lsp.protocol.make_client.capabilities()`)
+---Configure options for language servers passed to `vim.lsp.config(key, config)` (`:h vim.lsp.config`)
 ---Example
 --
 ---```lua
----capabilities = {
----  textDocument = {
----    foldingRange = { dynamicRegistration = false }
----  }
+---config = {
+---  ["*"] = {
+---    capabilities = {
+---      textDocument = {
+---        foldingRange = { dynamicRegistration = false }
+---      }
+---    },
+---    flags = { exit_timeout = 5000 },
+---  },
 ---}
 ---```
----@field capabilities lsp.ClientCapabilities?
+---@field config table<string,vim.lsp.Config>?
 ---Configure default options passed to `vim.lsp.buf` functions
 ---Example:
 ---
@@ -168,13 +173,6 @@
 --- }
 ---```
 ---@field file_operations AstroLSPFileOperationsOpts|false?
----A custom flags table to be passed to all language servers  (`:h lspconfig-setup`)
----Example:
---
----```lua
----flags = { exit_timeout = 5000 }
----```
----@field flags table?
 ---Configuration options for controlling formatting with language servers
 ---Example:
 --
@@ -294,10 +292,9 @@ local M = {
     semantic_tokens = true,
     signature_help = false,
   },
-  capabilities = {},
+  config = {},
   defaults = {},
   file_operations = { timeout = 10000, operations = {} },
-  flags = {},
   formatting = { format_on_save = { enabled = true }, disabled = {} },
   handlers = {},
   lsp_handlers = {},

lua/astrolsp/init.lua

@@ -229,12 +229,16 @@ function M.setup(opts)
   -- enable necessary capabilities for enabled LSP file operations
   local fileOperations = vim.tbl_get(M.config, "file_operations", "operations")
   if fileOperations and not vim.tbl_isempty(fileOperations) then
-    M.config.capabilities = vim.tbl_deep_extend("force", M.config.capabilities or {}, {
-      workspace = { fileOperations = fileOperations },
+    M.config.config = vim.tbl_deep_extend("force", M.config.config or {}, {
+      ["*"] = {
+        capabilities = { workspace = { fileOperations = fileOperations } },
+      },
     })
   end
 
-  vim.lsp.config("*", { capabilities = M.config.capabilities, flags = M.config.flags })
+  for server, config in pairs(M.config.config) do
+    vim.lsp.config(server, config)
+  end
 
   -- Set up tracking of signature help trigger characters
   M.add_on_attach(M.on_attach, {