diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua index 5503ff12..2548344e 100644 --- a/lua/lazyvim/plugins/extras/lang/java.lua +++ b/lua/lazyvim/plugins/extras/lang/java.lua @@ -152,13 +152,13 @@ return { if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then local java_dbg_path = LazyVim.get_pkg_path("java-debug-adapter") local jar_patterns = { - java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar", + vim.fn.expand "$MASON/share/java-debug-adapter/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_path = LazyVim.get_pkg_path("java-test") vim.list_extend(jar_patterns, { - java_test_path .. "/extension/server/*.jar", + vim.fn.expand "$MASON/share/java-test/*.jar", }) end for _, jar_pattern in ipairs(jar_patterns) do diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua index 408e9858..5510a8a8 100644 --- a/lua/lazyvim/plugins/lsp/init.lua +++ b/lua/lazyvim/plugins/lsp/init.lua @@ -196,7 +196,7 @@ return { 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) + all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package) elseif have_mason then all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package) end diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua index ad1e05dd..d6731e2b 100644 --- a/lua/lazyvim/util/init.lua +++ b/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 = vim.fs.normalize(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)