From 6c5baa288f30d08a1d70bf6285908b22762c972a Mon Sep 17 00:00:00 2001
From: Riccardo Strina <riccardo.strina@icloud.com>
Date: Wed, 5 Nov 2025 23:35:01 +0100
Subject: [PATCH] Move Java struct initialization out of
 language_server_binary_path

- In the instance language_server_binary_path is not called, due to user
provided JDTLS in the PATH, the extension would have failed
---
 src/java.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/java.rs b/src/java.rs
index 7bc8b11..5b2f651 100644
--- a/src/java.rs
+++ b/src/java.rs
@@ -59,11 +59,7 @@ impl Java {
             .map(|v| &mut v.1)
     }
 
-    fn language_server_binary_path(
-        &mut self,
-        language_server_id: &LanguageServerId,
-        worktree: &Worktree,
-    ) -> zed::Result<PathBuf> {
+    fn init(&mut self, worktree: &Worktree) {
         // Initialize lsp client and debugger
 
         if self.integrations.is_none() {
@@ -72,7 +68,12 @@ impl Java {
 
             self.integrations = Some((lsp, debugger));
         }
+    }
 
+    fn language_server_binary_path(
+        &mut self,
+        language_server_id: &LanguageServerId,
+    ) -> zed::Result<PathBuf> {
         // Use cached path if exists
 
         if let Some(path) = &self.cached_binary_path
@@ -276,6 +277,8 @@ impl Extension for Java {
             None
         };
 
+        self.init(worktree);
+
         if let Some(launcher) = get_jdtls_launcher_from_path(worktree) {
             // if the user has `jdtls(.bat)` on their PATH, we use that
             args.push(launcher);
@@ -285,7 +288,7 @@ impl Extension for Java {
         } else {
             // otherwise we launch ourselves
             args.extend(build_jdtls_launch_args(
-                &self.language_server_binary_path(language_server_id, worktree)?,
+                &self.language_server_binary_path(language_server_id)?,
                 &configuration,
                 worktree,
                 lombok_jvm_arg.into_iter().collect(),