Skip to content

Commit a04505c

Browse files
authored
feat: add mason v2.x support (#687)
1 parent 2feffcf commit a04505c

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

lua/rustaceanvim/config/internal.lua

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,12 @@ local RustaceanDefaultConfig = {
344344
local has_mason, mason_registry = pcall(require, 'mason-registry')
345345
if has_mason and mason_registry.is_installed('codelldb') then
346346
local codelldb_package = mason_registry.get_package('codelldb')
347-
local mason_codelldb_path = vim.fs.joinpath(codelldb_package:get_install_path(), 'extension')
347+
local mason_codelldb_path
348+
if require('mason.version').MAJOR_VERSION > 1 then
349+
mason_codelldb_path = vim.fs.joinpath(vim.fn.expand('$MASON'), 'packages', codelldb_package.name, 'extension')
350+
else
351+
mason_codelldb_path = vim.fs.joinpath(codelldb_package:get_install_path(), 'extension')
352+
end
348353
local codelldb_path = vim.fs.joinpath(mason_codelldb_path, 'adapter', 'codelldb')
349354
local liblldb_path = vim.fs.joinpath(mason_codelldb_path, 'lldb', 'lib', 'liblldb')
350355
local shell = require('rustaceanvim.shell')

0 commit comments

Comments
 (0)