From f19b51c0b2d5cdaa1b2e8c4e84e9d6058a39af34 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Wed, 17 Jul 2024 10:40:25 -0400 Subject: [PATCH] zig: Revert changes dependent on new `zed_extension_api` (#14652) This PR reverts the changes to the Zig extension dependent on the new `zed_extension_api` version so that we can publish the Zig extension. Release Notes: - N/A --- Cargo.lock | 2 +- extensions/zig/Cargo.toml | 2 +- extensions/zig/src/zig.rs | 12 +++++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c64a98e713..ec6c392729 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13950,7 +13950,7 @@ dependencies = [ name = "zed_zig" version = "0.1.3" dependencies = [ - "zed_extension_api 0.0.7", + "zed_extension_api 0.0.6", ] [[package]] diff --git a/extensions/zig/Cargo.toml b/extensions/zig/Cargo.toml index 9df0126887..a210126b21 100644 --- a/extensions/zig/Cargo.toml +++ b/extensions/zig/Cargo.toml @@ -13,4 +13,4 @@ path = "src/zig.rs" crate-type = ["cdylib"] [dependencies] -zed_extension_api = { path = "../../crates/extension_api" } +zed_extension_api = "0.0.6" diff --git a/extensions/zig/src/zig.rs b/extensions/zig/src/zig.rs index 755834fd19..f28cc48125 100644 --- a/extensions/zig/src/zig.rs +++ b/extensions/zig/src/zig.rs @@ -56,11 +56,21 @@ impl ZigExtension { &language_server_id, &zed::LanguageServerInstallationStatus::CheckingForUpdate, ); + // TODO: Once we're ready to release v0.0.7 of the Zed extension API we want to pin + // ZLS to a specific version with `zed::github_release_by_tag_name`. // We're pinning ZLS to a release that has `.tar.gz` assets, since the latest release does not have // them, at time of writing. // // ZLS tracking issue: https://github.com/zigtools/zls/issues/1879 - let release = zed::github_release_by_tag_name("zigtools/zls", "0.11.0")?; + // let release = zed::github_release_by_tag_name("zigtools/zls", "0.11.0")?; + + let release = zed::latest_github_release( + "zigtools/zls", + zed::GithubReleaseOptions { + require_assets: true, + pre_release: false, + }, + )?; let (platform, arch) = zed::current_platform(); let asset_name = format!(