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

fix(mason): conform to v2 changes

Browse source
This commit is contained in:
Iordanis Petkakis 2025-05-08 20:45:00 +03:00
commit 040be9b87a
24 changed files with 85 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/lazyvim/plugins/extras/formatting/biome.lua
View file

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

2
lua/lazyvim/plugins/extras/formatting/black.lua
View file

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

2
lua/lazyvim/plugins/extras/formatting/prettier.lua
View file

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

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

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

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

@ -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" } },
},

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

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

6
lua/lazyvim/plugins/extras/lang/go.lua
View file

@ -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" } },
},
{

4
lua/lazyvim/plugins/extras/lang/haskell.lua
View file

@ -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" } },
},
},

11
lua/lazyvim/plugins/extras/lang/java.lua
View file

@ -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 = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
local lombok_jar = LazyVim.get_pkg_path("jdtls", "/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 = java_dbg_pkg:get_install_path()
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",
}
-- 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 = java_test_pkg:get_install_path()
local java_test_path = LazyVim.get_pkg_path("java-test")
vim.list_extend(jar_patterns, {
java_test_path .. "/extension/server/*.jar",
})

6
lua/lazyvim/plugins/extras/lang/kotlin.lua
View file

@ -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

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

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

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

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

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

@ -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",

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

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

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

@ -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")

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

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

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

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

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

@ -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")

2
lua/lazyvim/plugins/extras/util/dot.lua
View file

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

2
lua/lazyvim/plugins/extras/util/gitui.lua
View file

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