Skip to content

Move Java struct initialization out of language_server_binary_path #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

Move Java struct initialization out of language_server_binary_path #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/java.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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(),
Expand Down