zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

toml: Fix language server installation on Windows (#11251)

Browse Source 
Release Notes:

- N/A


---

Follow #11156, to make sure extensions install on window.

https://github.com/tamasfe/taplo/releases/tag/0.8.1

The Taplo have `gz` for windows, so we can just use `gz`.

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
This commit is contained in:
Jason Lee 2024-05-03 23:11:46 +08:00 committed by GitHub
parent b3d969ef3c
commit beee79a9e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
extensions/toml/src/toml.rs
View File

@ -31,7 +31,7 @@ impl TomlExtension {
let (platform, arch) = zed::current_platform();
let asset_name = format!(
"taplo-full-{os}-{arch}.{extension}",
"taplo-full-{os}-{arch}.gz",
arch = match arch {
zed::Architecture::Aarch64 => "aarch64",
zed::Architecture::X86 => "x86",
@ -42,10 +42,6 @@ impl TomlExtension {
zed::Os::Linux => "linux",
zed::Os::Windows => "windows",
},
extension = match platform {
zed::Os::Mac | zed::Os::Linux => "gz",
zed::Os::Windows => "zip",
}
);
let asset = release
@ -58,7 +54,13 @@ impl TomlExtension {
fs::create_dir_all(&version_dir)
.map_err(|err| format!("failed to create directory '{version_dir}': {err}"))?;
let binary_path = format!("{version_dir}/taplo");
let binary_path = format!(
"{version_dir}/{bin_name}",
bin_name = match platform {
zed::Os::Windows => "taplo.exe",
zed::Os::Mac | zed::Os::Linux => "taplo",
}
);
if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) {
zed::set_language_server_installation_status(
@ -69,10 +71,7 @@ impl TomlExtension {
zed::download_file(
&asset.download_url,
&binary_path,
match platform {
zed::Os::Mac | zed::Os::Linux => zed::DownloadedFileType::Gzip,
zed::Os::Windows => zed::DownloadedFileType::Zip,
},
zed::DownloadedFileType::Gzip,
)
.map_err(|err| format!("failed to download file: {err}"))?;