mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-07-14 11:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve mason deps' assets resolution

Browse source
This commit is contained in:
TheDSCPL 2025-05-14 02:29:56 +00:00
parent 759e410984
commit 060b7ca704
No known key found for this signature in database
GPG key ID: 47B781E11EFDE8AD
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/lazyvim/plugins/extras/lang/php.lua
View file

@ -50,7 +50,7 @@ return {
local dap = require("dap") local dap = require("dap")
dap.adapters.php = { dap.adapters.php = {
type = "executable", type = "executable",
command = "php-debug-adapter", command = vim.fn.exepath("php-debug-adapter"),
args = {}, args = {},
} }
end, end,

10
lua/lazyvim/plugins/extras/lang/rust.lua
View file

@ -111,13 +111,9 @@ return {
}, },
config = function(_, opts) config = function(_, opts)
if LazyVim.has("mason.nvim") then if LazyVim.has("mason.nvim") then
local package_path = LazyVim.get_pkg_path("codelldb") local codelldb = vim.fn.exepath("codelldb")
local codelldb = package_path .. "/extension/adapter/codelldb" local codelldb_lib_ext = io.popen("uname"):read("*l") == "Linux" and ".so" or ".dylib"
local library_path = package_path .. "/extension/lldb/lib/liblldb.dylib" local library_path = vim.fn.expand("$MASON/opt/lldb/lib/liblldb" .. codelldb_lib_ext)
local uname = io.popen("uname"):read("*l")
if uname == "Linux" then
library_path = package_path .. "/extension/lldb/lib/liblldb.so"
end
opts.dap = { opts.dap = {
adapter = require("rustaceanvim.config").get_codelldb_adapter(codelldb, library_path), adapter = require("rustaceanvim.config").get_codelldb_adapter(codelldb, library_path),
} }

7
tests/extras/extra_spec.lua
View file

@ -26,7 +26,12 @@ describe("Extra", function()
return not vim.tbl_contains(ignore, extra.modname) return not vim.tbl_contains(ignore, extra.modname)
end, extras) end, extras)
local lsp_to_pkg = require("mason-lspconfig").get_mappings().lspconfig_to_package local lsp_to_pkg = {}
if vim.fn.has("nvim-0.11") == 1 then
lsp_to_pkg = require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package
else
lsp_to_pkg = require("mason-lspconfig.mappings.server").lspconfig_to_package
end
local tsspec = Plugin.Spec.new({ local tsspec = Plugin.Spec.new({
import = "lazyvim.plugins.treesitter", import = "lazyvim.plugins.treesitter",