From 2e11021a8b84ae38b5f12367779c9d03d485ae6a Mon Sep 17 00:00:00 2001
From: Artem Kolomeetc <akolomeetc@microsoft.com>
Date: Wed, 26 Mar 2025 22:11:35 -0700
Subject: [PATCH] Fixed jdtls bin path for a proper lsp initialization

---
 lua/lazyvim/plugins/extras/lang/java.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index 236c86c9..5559fd50 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -85,10 +85,13 @@ return {
     dependencies = { "folke/which-key.nvim" },
     ft = java_filetypes,
     opts = function()
-      local cmd = { vim.fn.exepath("jdtls") }
+      local cmd = { vim.fn.exepath("jdtls") } -- Can be empty if executed too early
       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"
+
+        -- Should be re-executed after require("mason-registry") to get a real value
+        cmd = { vim.fn.exepath("jdtls") }
         table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
       end
       return {