From d1847a25b0e43098612654ddb01881134ddeb656 Mon Sep 17 00:00:00 2001
From: Fredy Wijaya <fredy.wijaya@gmail.com>
Date: Wed, 27 May 2026 21:13:40 -0500
Subject: [PATCH] feat: Add configuration option for custom java-lsp-proxy path

This adds the `lsp_proxy_path` setting under `lsp.jdtls.settings`.
When set, the extension will prioritize the configured binary path for `java-lsp-proxy`,
avoiding downloading or updating it.

Fixes https://github.com/zed-extensions/java/issues/261
---
 README.md     |  3 ++-
 src/config.rs | 17 +++++++++++++++++
 src/proxy.rs  | 17 ++++++++++++-----
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index c524b9a..9d2c48c 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,8 @@ Here is a common `settings.json` including the above mentioned configurations:
       // When these are set, the extension will not download or manage these components
       "jdtls_launcher": "/path/to/your/jdt-language-server/bin/jdtls",
       "lombok_jar": "/path/to/your/lombok.jar",
-      "java_debug_jar": "/path/to/your/com.microsoft.java.debug.plugin.jar"
+      "java_debug_jar": "/path/to/your/com.microsoft.java.debug.plugin.jar",
+      "lsp_proxy_path": "/path/to/your/java-lsp-proxy"
     }
   }
 }
diff --git a/src/config.rs b/src/config.rs
index 30cdbb3..7d0553d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -145,3 +145,20 @@ pub fn get_java_debug_jar(configuration: &Option<Value>, worktree: &Worktree) ->
 
     None
 }
+
+pub fn get_lsp_proxy_path(configuration: &Option<Value>, worktree: &Worktree) -> Option<String> {
+    if let Some(configuration) = configuration
+        && let Some(lsp_proxy_path) = configuration
+            .pointer("/lsp_proxy_path")
+            .and_then(|x| x.as_str())
+    {
+        match expand_home_path(worktree, lsp_proxy_path.to_string()) {
+            Ok(path) => return Some(path),
+            Err(err) => {
+                println!("{err}");
+            }
+        }
+    }
+
+    None
+}
diff --git a/src/proxy.rs b/src/proxy.rs
index 62adf73..72f3958 100644
--- a/src/proxy.rs
+++ b/src/proxy.rs
@@ -7,6 +7,7 @@ use zed_extension_api::{
     set_language_server_installation_status,
 };
 
+use crate::config::get_lsp_proxy_path;
 use crate::util::{mark_checked_once, remove_all_files_except, should_use_local_or_download};
 
 const PROXY_BINARY: &str = "java-lsp-proxy";
@@ -66,7 +67,13 @@ pub fn binary_path(
     language_server_id: &LanguageServerId,
     worktree: &Worktree,
 ) -> zed::Result<String> {
-    // 1. Respect check_updates setting (Never/Once/Always)
+    // 1. Prioritize explicitly configured custom proxy binary if it exists.
+    if let Some(path) = get_lsp_proxy_path(configuration, worktree) {
+        *cached = Some(path.clone());
+        return Ok(path);
+    }
+
+    // 2. Respect check_updates setting (Never/Once/Always)
     //    Returns Some(path) when local install exists and policy says use it.
     //    Returns None when policy allows downloading.
     //    Returns Err when policy is Never/Once-exhausted with no local install.
@@ -82,7 +89,7 @@ pub fn binary_path(
         }
     }
 
-    // 2. Auto-download from GitHub releases
+    // 3. Auto-download from GitHub releases
     if let Ok((name, file_type)) = asset_name()
         && let Ok(release) = zed::latest_github_release(
             GITHUB_REPO,
@@ -121,19 +128,19 @@ pub fn binary_path(
         }
     }
 
-    // 3. Fallback: local install (covers "always" mode when download fails)
+    // 4. Fallback: local install (covers "always" mode when download fails)
     if let Some(path) = find_latest_local() {
         let s = path.to_string_lossy().to_string();
         *cached = Some(s.clone());
         return Ok(s);
     }
 
-    // 4. Fallback: binary on $PATH
+    // 5. Fallback: binary on $PATH
     if let Some(path) = worktree.which(proxy_exec().as_str()) {
         return Ok(path);
     }
 
-    // 5. Stale cache fallback
+    // 6. Stale cache fallback
     if let Some(path) = cached.as_deref()
         && metadata(path).is_ok()
     {