fix(mason): conform to v2 changes

lua/lazyvim/plugins/extras/formatting/biome.lua

@@ -24,7 +24,7 @@ local supported = {
 
 return {
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "biome" } },
   },
 

lua/lazyvim/plugins/extras/formatting/black.lua

@@ -1,6 +1,6 @@
 return {
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = function(_, opts)
       table.insert(opts.ensure_installed, "black")
     end,

lua/lazyvim/plugins/extras/formatting/prettier.lua

@@ -58,7 +58,7 @@ M.has_parser = LazyVim.memoize(M.has_parser)
 
 return {
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "prettier" } },
   },
 

lua/lazyvim/plugins/extras/lang/ansible.lua

@@ -6,7 +6,7 @@ return {
     })
   end,
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "ansible-lint" } },
   },
   {

lua/lazyvim/plugins/extras/lang/clangd.lua

@@ -117,7 +117,7 @@ return {
     optional = true,
     dependencies = {
       -- Ensure C/C++ debugger is installed
-      "williamboman/mason.nvim",
+      "mason-org/mason.nvim",
       optional = true,
       opts = { ensure_installed = { "codelldb" } },
     },

lua/lazyvim/plugins/extras/lang/elm.lua

@@ -10,7 +10,7 @@ return {
   },
 
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "elm-format" } },
   },
 

lua/lazyvim/plugins/extras/lang/go.lua

@@ -75,7 +75,7 @@ return {
   },
   -- Ensure Go tools are installed
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "goimports", "gofumpt" } },
   },
   {
@@ -83,7 +83,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = { ensure_installed = { "gomodifytags", "impl" } },
       },
     },
@@ -111,7 +111,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = { ensure_installed = { "delve" } },
       },
       {

lua/lazyvim/plugins/extras/lang/haskell.lua

@@ -28,7 +28,7 @@ return {
   },
 
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "haskell-language-server" } },
   },
 
@@ -37,7 +37,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = { ensure_installed = { "haskell-debug-adapter" } },
       },
     },

lua/lazyvim/plugins/extras/lang/java.lua

@@ -56,7 +56,7 @@ return {
     end,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = { ensure_installed = { "java-debug-adapter", "java-test" } },
       },
     },
@@ -87,8 +87,7 @@ return {
     opts = function()
       local cmd = { vim.fn.exepath("jdtls") }
       if LazyVim.has("mason.nvim") then
-        local mason_registry = require("mason-registry")
+        local lombok_jar = LazyVim.get_pkg_path("jdtls", "/lombok.jar")
-        local lombok_jar = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
         table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
       end
       return {
@@ -151,15 +150,13 @@ return {
       if LazyVim.has("mason.nvim") then
         local mason_registry = require("mason-registry")
         if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
-          local java_dbg_pkg = mason_registry.get_package("java-debug-adapter")
+          local java_dbg_path = LazyVim.get_pkg_path("java-debug-adapter")
-          local java_dbg_path = java_dbg_pkg:get_install_path()
           local jar_patterns = {
             java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar",
           }
           -- java-test also depends on java-debug-adapter.
           if opts.test and mason_registry.is_installed("java-test") then
-            local java_test_pkg = mason_registry.get_package("java-test")
+            local java_test_path = LazyVim.get_pkg_path("java-test")
-            local java_test_path = java_test_pkg:get_install_path()
             vim.list_extend(jar_patterns, {
               java_test_path .. "/extension/server/*.jar",
             })

lua/lazyvim/plugins/extras/lang/kotlin.lua

@@ -14,7 +14,7 @@ return {
   end,
   -- Add packages(linting, debug adapter)
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "ktlint" } },
   },
   -- Add syntax highlighting
@@ -35,7 +35,7 @@ return {
   {
     "mfussenegger/nvim-lint",
     optional = true,
-    dependencies = "williamboman/mason.nvim",
+    dependencies = "mason-org/mason.nvim",
     opts = {
       linters_by_ft = { kotlin = { "ktlint" } },
     },
@@ -64,7 +64,7 @@ return {
   {
     "mfussenegger/nvim-dap",
     optional = true,
-    dependencies = "williamboman/mason.nvim",
+    dependencies = "mason-org/mason.nvim",
     opts = function()
       local dap = require("dap")
       if not dap.adapters.kotlin then

lua/lazyvim/plugins/extras/lang/markdown.lua

@@ -40,7 +40,7 @@ return {
     },
   },
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "markdownlint-cli2", "markdown-toc" } },
   },
   {

lua/lazyvim/plugins/extras/lang/omnisharp.lua

@@ -36,7 +36,7 @@ return {
     },
   },
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "csharpier", "netcoredbg" } },
   },
   {

lua/lazyvim/plugins/extras/lang/php.lua

@@ -35,7 +35,7 @@ return {
   },
 
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = {
       ensure_installed = {
         "phpcs",
@@ -48,7 +48,7 @@ return {
     optional = true,
     opts = function()
       local dap = require("dap")
-      local path = require("mason-registry").get_package("php-debug-adapter"):get_install_path()
+      local path = LazyVim.get_pkg_path("php-debug-adapter")
       dap.adapters.php = {
         type = "executable",
         command = "node",

lua/lazyvim/plugins/extras/lang/ruby.lua

@@ -48,7 +48,7 @@ return {
     },
   },
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "erb-formatter", "erb-lint" } },
   },
   {

lua/lazyvim/plugins/extras/lang/rust.lua

@@ -43,7 +43,7 @@ return {
 
   -- Ensure Rust debugger is installed
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     optional = true,
     opts = function(_, opts)
       opts.ensure_installed = opts.ensure_installed or {}
@@ -111,7 +111,7 @@ return {
     },
     config = function(_, opts)
       if LazyVim.has("mason.nvim") then
-        local package_path = require("mason-registry").get_package("codelldb"):get_install_path()
+        local package_path = LazyVim.get_pkg_path("codelldb")
         local codelldb = package_path .. "/extension/adapter/codelldb"
         local library_path = package_path .. "/extension/lldb/lib/liblldb.dylib"
         local uname = io.popen("uname"):read("*l")

lua/lazyvim/plugins/extras/lang/sql.lua

@@ -143,7 +143,7 @@ return {
 
   -- Linters & formatters
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "sqlfluff" } },
   },
   {

lua/lazyvim/plugins/extras/lang/terraform.lua

@@ -20,7 +20,7 @@ return {
   },
   -- ensure terraform tools are installed
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "tflint" } },
   },
   {

lua/lazyvim/plugins/extras/lang/typescript.lua

@@ -194,7 +194,7 @@ return {
     optional = true,
     dependencies = {
       {
-        "williamboman/mason.nvim",
+        "mason-org/mason.nvim",
         opts = function(_, opts)
           opts.ensure_installed = opts.ensure_installed or {}
           table.insert(opts.ensure_installed, "js-debug-adapter")

lua/lazyvim/plugins/extras/util/dot.lua

@@ -18,7 +18,7 @@ return {
     },
   },
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "shellcheck" } },
   },
   -- add some stuff to treesitter

lua/lazyvim/plugins/extras/util/gitui.lua

@@ -2,7 +2,7 @@ return {
 
   -- Ensure GitUI tool is installed
   {
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     opts = { ensure_installed = { "gitui" } },
     keys = {
       {

lua/lazyvim/plugins/lsp/init.lua

@@ -2,10 +2,14 @@ return {
   -- lspconfig
   {
     "neovim/nvim-lspconfig",
-    event = "LazyFile",
+    event = vim.fn.has("nvim-0.11") == 1 and { "BufReadPre", "BufNewFile", "BufWritePre" } or "LazyFile",
     dependencies = {
       "mason.nvim",
-      { "williamboman/mason-lspconfig.nvim", config = function() end },
+      {
+        "mason-org/mason-lspconfig.nvim",
+        version = vim.fn.has("nvim-0.11") == 0 and "1.32.0" or false,
+        config = function() end,
+      },
     },
     opts = function()
       ---@class PluginLspOpts
@@ -188,7 +192,18 @@ return {
         opts.capabilities or {}
       )
 
-      local function setup(server)
+      -- get all the servers that are available through mason-lspconfig
+      local have_mason, mlsp = pcall(require, "mason-lspconfig")
+      local all_mslp_servers = {}
+      if have_mason and vim.fn.has("nvim-0.11") == 1 then
+        all_mslp_servers = vim.tbl_keys(require("mason-lspconfig").get_mappings().lspconfig_to_package)
+      elseif have_mason then
+        all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package)
+      end
+
+      local exclude_automatic_enable = {} ---@type string[]
+
+      local function configure(server)
         local server_opts = vim.tbl_deep_extend("force", {
           capabilities = vim.deepcopy(capabilities),
         }, servers[server] or {})
@@ -205,14 +220,22 @@ return {
             return
           end
         end
+        if vim.fn.has("nvim-0.11") == 1 then
+          vim.lsp.config(server, server_opts)
+        else
           require("lspconfig")[server].setup(server_opts)
         end
 
-      -- get all the servers that are available through mason-lspconfig
+        -- manually enable if mason=false or if this is a server that cannot be installed with mason-lspconfig
-      local have_mason, mlsp = pcall(require, "mason-lspconfig")
+        if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then
-      local all_mslp_servers = {}
+          if vim.fn.has("nvim-0.11") == 1 then
-      if have_mason then
+            vim.lsp.enable(server)
-        all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package)
+          else
+            configure(server)
+          end
+          return true
+        end
+        return false
       end
 
       local ensure_installed = {} ---@type string[]
@@ -221,8 +244,8 @@ return {
           server_opts = server_opts == true and {} or server_opts
           if server_opts.enabled ~= false then
             -- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig
-            if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then
+            if configure(server) then
-              setup(server)
+              exclude_automatic_enable[#exclude_automatic_enable + 1] = server
             else
               ensure_installed[#ensure_installed + 1] = server
             end
@@ -231,14 +254,23 @@ return {
       end
 
       if have_mason then
-        mlsp.setup({
+        local setup_config = {
           ensure_installed = vim.tbl_deep_extend(
             "force",
             ensure_installed,
             LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {}
           ),
-          handlers = { setup },
+        }
-        })
+
+        if vim.fn.has("nvim-0.11") == 1 then
+          setup_config.automatic_enable = {
+            exclude = exclude_automatic_enable,
+          }
+        else
+          setup_config.handlers = { configure }
+        end
+
+        mlsp.setup(setup_config)
       end
 
       if LazyVim.lsp.is_enabled("denols") and LazyVim.lsp.is_enabled("vtsls") then
@@ -257,8 +289,9 @@ return {
   -- cmdline tools and lsp servers
   {
 
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     cmd = "Mason",
+    version = vim.fn.has("nvim-0.11") == 0 and "1.11.0" or false,
     keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
     build = ":MasonUpdate",
     opts_extend = { "ensure_installed" },

lua/lazyvim/util/init.lua

@@ -253,7 +253,7 @@ function M.get_pkg_path(pkg, path, opts)
   opts = opts or {}
   opts.warn = opts.warn == nil and true or opts.warn
   path = path or ""
-  local ret = root .. "/packages/" .. pkg .. "/" .. path
+  local ret = root .. "/packages/" .. pkg .. path
   if opts.warn and not vim.loop.fs_stat(ret) and not require("lazy.core.config").headless() then
     M.warn(
       ("Mason package path not found for **%s**:\n- `%s`\nYou may need to force update the package."):format(pkg, path)

tests/extras/extra_spec.lua

@@ -44,7 +44,7 @@ describe("Extra", function()
         local mod = require(extra.modname)
         assert.is_not_nil(mod)
         local spec = Plugin.Spec.new({
-          { "williamboman/mason.nvim", opts = { ensure_installed = {} } },
+          { "mason-org/mason.nvim", opts = { ensure_installed = {} } },
           { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
           mod,
         }, { optional = true })
@@ -60,7 +60,7 @@ describe("Extra", function()
 
       local mod = require(extra.modname)
       local spec = Plugin.Spec.new({
-        { "williamboman/mason.nvim", opts = { ensure_installed = {} } },
+        { "mason-org/mason.nvim", opts = { ensure_installed = {} } },
         { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } },
         mod,
       }, { optional = true })

tests/minit.lua

@@ -8,8 +8,8 @@ require("lazy.minit").setup({
   spec = {
     { dir = vim.uv.cwd() },
     "LazyVim/starter",
-    "williamboman/mason-lspconfig.nvim",
+    "mason-org/mason-lspconfig.nvim",
-    "williamboman/mason.nvim",
+    "mason-org/mason.nvim",
     "nvim-treesitter/nvim-treesitter",
     { "echasnovski/mini.icons", opts = {} },
   },