Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gradle-bridge/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gradle-lsp-bridge"
version = "6.8.20"
version = "6.8.23"
edition = "2021"
publish = false
license = "Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
native_target := `rustc -vV | grep host | awk '{print $2}'`
ext_dir := if os() == "macos" { env("HOME") / "Library/Application Support/Zed/extensions/work/java" } else if os() == "linux" { env("HOME") / ".local/share/zed/extensions/work/java" } else { env("LOCALAPPDATA") / "Zed/extensions/work/java" }
proxy_bin := ext_dir / "bin" / "java-lsp-proxy"
tasks_bin := ext_dir / "bin" / "java-task-helper"
tasks_bin := ext_dir / "task-bin" / "java-task-helper"
bridge_bin := ext_dir / "bin" / "gradle-lsp-bridge"

# Build proxy in debug mode
Expand Down Expand Up @@ -30,7 +30,7 @@ task-release:

# Build task helper release and install to extension workdir for testing
task-install: task-release
mkdir -p "{{ ext_dir }}/bin"
mkdir -p "{{ ext_dir }}/task-bin"
cp "target/{{ native_target }}/release/java-task-helper" "{{ tasks_bin }}"
@echo "Installed to {{ ext_dir }}"

Expand Down
10 changes: 5 additions & 5 deletions languages/java/tasks.cmd.example.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[
{
"label": "Run $ZED_CUSTOM_java_class_name",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe\" run-class \"%ZED_FILE%\" \"%ZED_CUSTOM_java_package_name%\" \"%ZED_CUSTOM_java_class_name%\" \"%ZED_CUSTOM_java_outer_class_name%\"",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe\" run-class \"%ZED_FILE%\" \"%ZED_CUSTOM_java_package_name%\" \"%ZED_CUSTOM_java_class_name%\" \"%ZED_CUSTOM_java_outer_class_name%\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-main"]
},
{
"label": "Run $ZED_CUSTOM_java_class_name.$ZED_CUSTOM_java_method_name",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe\" run-test-method \"%ZED_FILE%\" \"%ZED_CUSTOM_java_package_name%\" \"%ZED_CUSTOM_java_class_name%\" \"%ZED_CUSTOM_java_outer_class_name%\" \"%ZED_CUSTOM_java_method_name%\"",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe\" run-test-method \"%ZED_FILE%\" \"%ZED_CUSTOM_java_package_name%\" \"%ZED_CUSTOM_java_class_name%\" \"%ZED_CUSTOM_java_outer_class_name%\" \"%ZED_CUSTOM_java_method_name%\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-method", "java-test-method-nested"]
},
{
"label": "Test class $ZED_CUSTOM_java_class_name",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe\" run-test-class \"%ZED_FILE%\" \"%ZED_CUSTOM_java_package_name%\" \"%ZED_CUSTOM_java_class_name%\" \"%ZED_CUSTOM_java_outer_class_name%\"",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe\" run-test-class \"%ZED_FILE%\" \"%ZED_CUSTOM_java_package_name%\" \"%ZED_CUSTOM_java_class_name%\" \"%ZED_CUSTOM_java_outer_class_name%\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-class", "java-test-class-nested"]
},
{
"label": "Run tests",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe\" run-all-tests \"%ZED_FILE%\"",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe\" run-all-tests \"%ZED_FILE%\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-all"]
},
{
"label": "Clear JDTLS cache",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe\" clear-cache",
"command": "\"%LOCALAPPDATA%\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe\" clear-cache",
"use_new_terminal": false,
"reveal": "always",
"tags": []
Expand Down
10 changes: 5 additions & 5 deletions languages/java/tasks.fish.example.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[
{
"label": "Run $ZED_CUSTOM_java_class_name",
"command": "\"$HOME/.local/share/zed/extensions/work/java/bin/java-task-helper\" run-class \"$ZED_FILE\" \"$ZED_CUSTOM_java_package_name\" \"$ZED_CUSTOM_java_class_name\" \"$ZED_CUSTOM_java_outer_class_name\"",
"command": "\"$HOME/.local/share/zed/extensions/work/java/task-bin/java-task-helper\" run-class \"$ZED_FILE\" \"$ZED_CUSTOM_java_package_name\" \"$ZED_CUSTOM_java_class_name\" \"$ZED_CUSTOM_java_outer_class_name\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-main"]
},
{
"label": "Run $ZED_CUSTOM_java_class_name.$ZED_CUSTOM_java_method_name",
"command": "\"$HOME/.local/share/zed/extensions/work/java/bin/java-task-helper\" run-test-method \"$ZED_FILE\" \"$ZED_CUSTOM_java_package_name\" \"$ZED_CUSTOM_java_class_name\" \"$ZED_CUSTOM_java_outer_class_name\" \"$ZED_CUSTOM_java_method_name\"",
"command": "\"$HOME/.local/share/zed/extensions/work/java/task-bin/java-task-helper\" run-test-method \"$ZED_FILE\" \"$ZED_CUSTOM_java_package_name\" \"$ZED_CUSTOM_java_class_name\" \"$ZED_CUSTOM_java_outer_class_name\" \"$ZED_CUSTOM_java_method_name\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-method", "java-test-method-nested"]
},
{
"label": "Test class $ZED_CUSTOM_java_class_name",
"command": "\"$HOME/.local/share/zed/extensions/work/java/bin/java-task-helper\" run-test-class \"$ZED_FILE\" \"$ZED_CUSTOM_java_package_name\" \"$ZED_CUSTOM_java_class_name\" \"$ZED_CUSTOM_java_outer_class_name\"",
"command": "\"$HOME/.local/share/zed/extensions/work/java/task-bin/java-task-helper\" run-test-class \"$ZED_FILE\" \"$ZED_CUSTOM_java_package_name\" \"$ZED_CUSTOM_java_class_name\" \"$ZED_CUSTOM_java_outer_class_name\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-class", "java-test-class-nested"]
},
{
"label": "Run tests",
"command": "\"$HOME/.local/share/zed/extensions/work/java/bin/java-task-helper\" run-all-tests \"$ZED_FILE\"",
"command": "\"$HOME/.local/share/zed/extensions/work/java/task-bin/java-task-helper\" run-all-tests \"$ZED_FILE\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-all"]
},
{
"label": "Clear JDTLS cache",
"command": "\"$HOME/.local/share/zed/extensions/work/java/bin/java-task-helper\" clear-cache",
"command": "\"$HOME/.local/share/zed/extensions/work/java/task-bin/java-task-helper\" clear-cache",
"use_new_terminal": false,
"reveal": "always",
"tags": []
Expand Down
10 changes: 5 additions & 5 deletions languages/java/tasks.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
[
{
"label": "Run $ZED_CUSTOM_java_class_name",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/bin/java-task-helper\\\" run-class \\\"$ZED_FILE\\\" \\\"${ZED_CUSTOM_java_package_name:-}\\\" \\\"$ZED_CUSTOM_java_class_name\\\" \\\"${ZED_CUSTOM_java_outer_class_name:-}\\\" ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe$Q run-class $Q$env:ZED_FILE$Q $Q$env:ZED_CUSTOM_java_package_name$Q $Q$env:ZED_CUSTOM_java_class_name$Q $Q$env:ZED_CUSTOM_java_outer_class_name$Q\"",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/task-bin/java-task-helper\\\" run-class \\\"$ZED_FILE\\\" \\\"${ZED_CUSTOM_java_package_name:-}\\\" \\\"$ZED_CUSTOM_java_class_name\\\" \\\"${ZED_CUSTOM_java_outer_class_name:-}\\\" ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe$Q run-class $Q$env:ZED_FILE$Q $Q$env:ZED_CUSTOM_java_package_name$Q $Q$env:ZED_CUSTOM_java_class_name$Q $Q$env:ZED_CUSTOM_java_outer_class_name$Q\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-main"]
},
{
"label": "Run $ZED_CUSTOM_java_class_name.${ZED_CUSTOM_java_outer_class_name:}.$ZED_CUSTOM_java_method_name",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/bin/java-task-helper\\\" run-test-method \\\"$ZED_FILE\\\" \\\"${ZED_CUSTOM_java_package_name:-}\\\" \\\"$ZED_CUSTOM_java_class_name\\\" \\\"${ZED_CUSTOM_java_outer_class_name:-}\\\" \\\"$ZED_CUSTOM_java_method_name\\\" ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe$Q run-test-method $Q$env:ZED_FILE$Q $Q$env:ZED_CUSTOM_java_package_name$Q $Q$env:ZED_CUSTOM_java_class_name$Q $Q$env:ZED_CUSTOM_java_outer_class_name$Q $Q$env:ZED_CUSTOM_java_method_name$Q\"",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/task-bin/java-task-helper\\\" run-test-method \\\"$ZED_FILE\\\" \\\"${ZED_CUSTOM_java_package_name:-}\\\" \\\"$ZED_CUSTOM_java_class_name\\\" \\\"${ZED_CUSTOM_java_outer_class_name:-}\\\" \\\"$ZED_CUSTOM_java_method_name\\\" ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe$Q run-test-method $Q$env:ZED_FILE$Q $Q$env:ZED_CUSTOM_java_package_name$Q $Q$env:ZED_CUSTOM_java_class_name$Q $Q$env:ZED_CUSTOM_java_outer_class_name$Q $Q$env:ZED_CUSTOM_java_method_name$Q\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-method", "java-test-method-nested"]
},
{
"label": "Test class $ZED_CUSTOM_java_class_name",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/bin/java-task-helper\\\" run-test-class \\\"$ZED_FILE\\\" \\\"${ZED_CUSTOM_java_package_name:-}\\\" \\\"$ZED_CUSTOM_java_class_name\\\" \\\"${ZED_CUSTOM_java_outer_class_name:-}\\\" ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe$Q run-test-class $Q$env:ZED_FILE$Q $Q$env:ZED_CUSTOM_java_package_name$Q $Q$env:ZED_CUSTOM_java_class_name$Q $Q$env:ZED_CUSTOM_java_outer_class_name$Q\"",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/task-bin/java-task-helper\\\" run-test-class \\\"$ZED_FILE\\\" \\\"${ZED_CUSTOM_java_package_name:-}\\\" \\\"$ZED_CUSTOM_java_class_name\\\" \\\"${ZED_CUSTOM_java_outer_class_name:-}\\\" ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe$Q run-test-class $Q$env:ZED_FILE$Q $Q$env:ZED_CUSTOM_java_package_name$Q $Q$env:ZED_CUSTOM_java_class_name$Q $Q$env:ZED_CUSTOM_java_outer_class_name$Q\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-class", "java-test-class-nested"]
},
{
"label": "Run tests",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/bin/java-task-helper\\\" run-all-tests \\\"$ZED_FILE\\\" ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe$Q run-all-tests $Q$env:ZED_FILE$Q\"",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/task-bin/java-task-helper\\\" run-all-tests \\\"$ZED_FILE\\\" ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe$Q run-all-tests $Q$env:ZED_FILE$Q\"",
"use_new_terminal": false,
"reveal": "always",
"tags": ["java-test-all"]
},
{
"label": "Clear JDTLS cache",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/bin/java-task-helper\\\" clear-cache ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\bin\\java-task-helper.exe$Q clear-cache\"",
"command": "set ErrorActionPreference SilentlyContinue ; eval \"EXT=\\\"${XDG_DATA_HOME:-$HOME/.local/share}/zed/extensions/work/java\\\"; if [ \\\"$(uname 2>/dev/null)\\\" = \\\"Darwin\\\" ]; then EXT=\\\"$HOME/Library/Application Support/Zed/extensions/work/java\\\"; fi; if [ -n \\\"$LOCALAPPDATA\\\" ]; then CYGP=$(cygpath -u \\\"$LOCALAPPDATA\\\" 2>/dev/null); if [ -n \\\"$CYGP\\\" ]; then EXT=\\\"$CYGP/zed/extensions/work/java\\\"; else EXT=\\\"$LOCALAPPDATA/zed/extensions/work/java\\\"; fi; fi; \\\"\\$EXT/task-bin/java-task-helper\\\" clear-cache ; exit\" ; set ErrorActionPreference Continue ; $Q=[char]34 ; iex \"& $Q$env:LOCALAPPDATA\\zed\\extensions\\work\\java\\task-bin\\java-task-helper.exe$Q clear-cache\"",
"use_new_terminal": false,
"reveal": "always",
"tags": []
Expand Down
2 changes: 1 addition & 1 deletion proxy-common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "proxy-common"
version = "6.8.20"
version = "6.8.23"
edition = "2021"
publish = false
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion proxy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "java-lsp-proxy"
version = "6.8.20"
version = "6.8.23"
edition = "2021"
publish = false
license = "Apache-2.0"
Expand Down
25 changes: 5 additions & 20 deletions src/gradle_bridge.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
use std::{fs::metadata, path::PathBuf};

use zed_extension_api::{
self as zed, DownloadedFileType, GithubReleaseOptions, LanguageServerId,
LanguageServerInstallationStatus, Worktree, serde_json::Value,
set_language_server_installation_status,
self as zed, DownloadedFileType, LanguageServerId, LanguageServerInstallationStatus, Worktree,
serde_json::Value, set_language_server_installation_status,
};

use crate::{
Expand Down Expand Up @@ -66,15 +65,7 @@ impl Downloadable for GradleBridge {
}

fn fetch_latest_version(&self, _worktree: &Worktree) -> zed::Result<String> {
Ok(zed::latest_github_release(
GITHUB_REPO,
GithubReleaseOptions {
require_assets: true,
pre_release: false,
},
)
.map_err(|err| format!("Failed to fetch latest bridge release from {GITHUB_REPO}: {err}"))?
.version)
Ok(format!("v{}", env!("CARGO_PKG_VERSION")))
}

fn download(
Expand All @@ -91,14 +82,8 @@ impl Downloadable for GradleBridge {
return Ok(PathBuf::from(bin_path));
}

let release = zed::latest_github_release(
GITHUB_REPO,
GithubReleaseOptions {
require_assets: true,
pre_release: false,
},
)
.map_err(|err| format!("Failed to fetch bridge release: {err}"))?;
let release = zed::github_release_by_tag_name(GITHUB_REPO, version)
.map_err(|err| format!("Failed to fetch bridge release: {err}"))?;

let asset = release
.assets
Expand Down
Loading