mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-22 00:49:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(java): only setup debug adapter config if mason is installed (for real this time) (#5014)

Browse source 
## Description

This one *actually* fixes the issue, sorry about my previous PR.
This commit is contained in:
iniw 2024-12-12 15:37:08 -03:00 • committed by GitHub
parent aad0edbf74
commit 5b1b6b29d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 54 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -146,14 +146,10 @@ return {
config = function(_, opts) config = function(_, opts)
-- Find the extra bundles that should be passed on the jdtls command-line -- Find the extra bundles that should be passed on the jdtls command-line
-- if nvim-dap is enabled with java debug/test. -- if nvim-dap is enabled with java debug/test.
local mason_registry = require("mason-registry")
local bundles = {} ---@type string[] local bundles = {} ---@type string[]
if if LazyVim.has("mason.nvim") then
LazyVim.has("mason.nvim") local mason_registry = require("mason-registry")
and opts.dap if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
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_pkg = mason_registry.get_package("java-debug-adapter")
local java_dbg_path = java_dbg_pkg:get_install_path() local java_dbg_path = java_dbg_pkg:get_install_path()
local jar_patterns = { local jar_patterns = {
@ -173,7 +169,7 @@ return {
end end
end end
end end
end
local function attach_jdtls() local function attach_jdtls()
local fname = vim.api.nvim_buf_get_name(0) local fname = vim.api.nvim_buf_get_name(0)
@ -245,12 +241,9 @@ return {
}, },
}) })
if if LazyVim.has("mason.nvim") then
LazyVim.has("mason.nvim") local mason_registry = require("mason-registry")
and opts.dap if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
and LazyVim.has("nvim-dap")
and mason_registry.is_installed("java-debug-adapter")
then
-- custom init for Java debugger -- custom init for Java debugger
require("jdtls").setup_dap(opts.dap) require("jdtls").setup_dap(opts.dap)
require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main) require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
@ -286,6 +279,7 @@ return {
}) })
end end
end end
end
-- User can set additional keymaps in opts.on_attach -- User can set additional keymaps in opts.on_attach
if opts.on_attach then if opts.on_attach then