feat!: move entirely to built in vim.lsp.config

Author: mehalter

README.md

@@ -12,7 +12,7 @@ AstroLSP provides a simple API for configuring and setting up language servers i
 
 ## ⚡️ Requirements
 
-- Neovim >= 0.10
+- Neovim >= 0.11
 
 ## 📦 Installation
 
@@ -89,27 +89,12 @@ local opts = {
       desc = "Format file with LSP",
     },
   },
-  -- Configure default capabilities for language servers (`:h vim.lsp.protocol.make_client.capabilities()`)
+  -- Configure default capabilities for all language servers (`:h vim.lsp.protocol.make_client.capabilities()`)
   capabilities = {
     textDocument = {
       foldingRange = { dynamicRegistration = false },
     },
   },
-  -- Configure language servers for `lspconfig` (`:h lspconfig-setup`)
-  config = {
-    lua_ls = {
-      settings = {
-        Lua = {
-          hint = { enable = true, arrayIndex = "Disable" },
-        },
-      },
-    },
-    clangd = {
-      capabilities = {
-        offsetEncoding = "utf-8",
-      },
-    },
-  },
   defaults = {
     hover = { border = "rounded", silent = true } -- customize lsp hover window
     signature_help = false, -- disable any default customizations
@@ -158,10 +143,10 @@ local opts = {
   },
   -- Configure how language servers get set up
   handlers = {
-    -- default handler, first entry with no key
-    function(server, opts) require("lspconfig")[server].setup(opts) end,
+    -- default handler uses key "*"
+    ["*"] = vim.lsp.enable,
     -- custom function handler for pyright
-    pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end,
+    pyright = function() vim.lsp.enable("pyright") end,
     -- set to false to disable the setup of a language server
     rust_analyzer = false,
   },
@@ -198,25 +183,12 @@ local opts = {
       },
     },
   },
- -- Extra configuration for the `mason-lspconfig.nvim` plugin
-  mason_lspconfig = {
-    -- Allow registering more Mason packages as language servers for autodetection/setup
-    servers = {
-      -- The key is the lspconfig server name to register a package for
-      nextflow_ls = {
-        -- The Mason package name to register to the language server
-        package = "nextflow-language-server",
-        -- The filetypes that apply to the package and language server
-        filetypes = { "nextflow" },
-        -- (Optional) any default configuration changes that may need to happen (can be a table or a function that returns a table)
-        config = { cmd = { "nextflow-language-server" } }
-      }
-    }
-  }
   -- A list like table of servers that should be setup, useful for enabling language servers not installed with Mason.
   servers = { "dartls" },
   -- A custom `on_attach` function to be run after the default `on_attach` function, takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
-  on_attach = function(client, bufnr) client.server_capabilities.semanticTokensProvider = nil end,
+  on_attach = function(client, bufnr)
+    -- custom on_attach code to run on all servers
+  end,
 }
 ```
 
@@ -228,43 +200,26 @@ local opts = {
 
 ```lua
 {
-  "neovim/nvim-lspconfig",
-  dependencies = {
-    { "AstroNvim/astrolsp", opts = {} },
-  },
-  config = function()
-    -- set up servers configured with AstroLSP
-    vim.tbl_map(require("astrolsp").lsp_setup, require("astrolsp").config.servers)
-  end,
+  "AstroNvim/astrolsp",
+  dependencies = { "neovim/nvim-lspconfig" },
+  opts = {}
 }
 ```
 
 ### [nvim-lspconfig][lspconfig] + [mason.nvim][mason] + [mason-lspconfig.nvim][mason-lspconfig]
 
 ```lua
 {
-  "neovim/nvim-lspconfig",
+  "AstroNvim/astrolsp",
   dependencies = {
-    { "AstroNvim/astrolsp", opts = {} },
+    "neovim/nvim-lspconfig",
     {
-      "williamboman/mason-lspconfig.nvim", -- MUST be set up before `nvim-lspconfig`
+      "williamboman/mason-lspconfig.nvim",
       dependencies = { "williamboman/mason.nvim" },
-      opts = {
-        -- use AstroLSP setup for mason-lspconfig
-        handlers = { function(server) require("astrolsp").lsp_setup(server) end },
-      },
-      config = function(_, opts)
-        -- Optionally tell AstroLSP to register new language servers before calling the `setup` function
-        -- this enables the `mason-lspconfig.servers` option in the AstroLSP configuration
-        require("astrolsp.mason-lspconfig").register_servers()
-        require("mason-lspconfig").setup(opts)
-      end
-    },
+      opts = {}
+    }
   },
-  config = function()
-    -- set up servers configured with AstroLSP
-    vim.tbl_map(require("astrolsp").lsp_setup, require("astrolsp").config.servers)
-  end,
+  opts = {}
 }
 ```
 
@@ -276,7 +231,9 @@ local opts = {
   dependencies = {
     { "AstroNvim/astrolsp", opts = {} },
   },
-  opts = function() return { on_attach = require("astrolsp").on_attach } end,
+  opts = {
+    on_attach = function(client, bufnr) require("astrolsp").on_attach(client, bufnr) end
+  },
 }
 ```
 

lua/astrolsp/config.lua

@@ -59,19 +59,7 @@
 ---@field hover vim.lsp.buf.hover.Opts|false? control the default options for `vim.lsp.buf.hover()` (`:h vim.lsp.buf.hover.Opts`)
 ---@field signature_help vim.lsp.buf.signature_help.Opts|false? control the default options for `vim.lsp.buf.signature_help()` (`:h vim.lsp.buf.signature_help.Opts`)
 
----@class AstroLSPMasonLspconfigServer
----@field public package string the Mason package name
----@field filetypes string|string[] the filetype(s) that the server applies to
----@field config? table|(fun(): table) extensions tothe default language server configuration
-
----@alias AstroLSPMasonLspconfigServers { [string]: AstroLSPMasonLspconfigServer }
-
----@class AstroLSPMasonLspconfigOpts
----@field servers AstroLSPMasonLspconfigServers? a table of servers to register with mason-lspconfig.nvim
-
 ---@class AstroLSPOpts
----_EXPERIMENTAL_ Use the native `vim.lsp.config` for LSP configuration
----@field native_lsp_config boolean?
 ---Configuration of auto commands
 ---The key into the table is the group name for the auto commands (`:h augroup`) and the value
 ---is a list of autocmd tables where `event` key is the event(s) that trigger the auto command
@@ -143,22 +131,6 @@
 ---}
 ---```
 ---@field capabilities lsp.ClientCapabilities?
----Configure language servers for `lspconfig` (`:h lspconfig-setup`)
----Example:
---
----```lua
----config = {
----  lua_ls = {
----    settings = {
----      Lua = {
----        hint = { enable = true, arrayIndex = "Disable" }
----      }
----    }
----  },
----  clangd = { capabilities = { offsetEncoding = "utf-8" } },
----}
----```
----@field config lspconfig.options?
 ---Configure default options passed to `vim.lsp.buf` functions
 ---Example:
 ---
@@ -239,18 +211,16 @@
 ---```lua
 ---handlers = {
 ---  -- default handler
----  function(server, opts)
----    require("lspconfig")[server].setup(opts)
----  end,
+---  ["*"] = vim.lsp.enable,
 ---  -- custom function handler for pyright
----  pyright = function(_, opts)
----    require("lspconfig").pyright.setup(opts)
+---  pyright = function()
+---    -- some custom logic
 ---  end,
 ---  -- set to false to disable the setup of a language server
 ---  rust_analyzer = false,
 ---}
 ---```
----@field handlers table<string|integer,fun(server:string,opts:_.lspconfig.options)|boolean?>?
+---@field handlers table<string,fun(server:string)|boolean?>?
 ---Configure global LSP handlers, set a method to `false` to use the Neovim default (`:h vim.lsp.handlers`)
 ---Example:
 --
@@ -296,21 +266,6 @@
 ---}
 ---```
 ---@field mappings AstroLSPMappings?
----Extra options for the `mason-lspconfig.nvim` plugin such as registering new packages as language servers.
----Example:
---
----```lua
----mason_lspconfig = {
----  servers = {
----    nextflow_ls = {
----      package = "nextflow-language-server",
----      filetypes = "nextflow",
----      config = { cmd = { "nextflow-language-server" } }
----    }
----  }
----}
----```
----@field mason_lspconfig AstroLSPMasonLspconfigOpts?
 ---A list like table of servers that should be setup, useful for enabling language servers not installed with Mason.
 ---Example:
 --
@@ -330,7 +285,6 @@
 
 ---@type AstroLSPOpts
 local M = {
-  native_lsp_config = false,
   autocmds = {},
   commands = {},
   features = {
@@ -340,16 +294,13 @@ local M = {
     signature_help = false,
   },
   capabilities = {},
-  ---@diagnostic disable-next-line: missing-fields
-  config = {},
   defaults = {},
   file_operations = { timeout = 10000, operations = {} },
   flags = {},
   formatting = { format_on_save = { enabled = true }, disabled = {} },
   handlers = {},
   lsp_handlers = {},
   mappings = {},
-  mason_lspconfig = {},
   servers = {},
   on_attach = nil,
 }