Keep file permissions when extracting zip archives on Unix (#31304)

Follow-up of https://github.com/zed-industries/zed/pull/31080

Stop doing

```rs
#[cfg(not(windows))]
{
    file.set_permissions(<fs::Permissions as fs::unix::PermissionsExt>::from_mode(
        0o755,
    ))
    .await?;
}
```

after extracting zip archives on Unix, and use an API that provides the
file permissions data for each archive entry.

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2025-05-23 23:45:32 +03:00 committed by GitHub
parent ca72efe701
commit 7341ab3980
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 150 additions and 91 deletions

View file

@ -7,7 +7,7 @@ pub use language::*;
use lsp::{DiagnosticTag, InitializeParams, LanguageServerBinary, LanguageServerName};
use project::lsp_store::clangd_ext;
use serde_json::json;
use smol::{fs, io::BufReader};
use smol::fs;
use std::{any::Any, env::consts, path::PathBuf, sync::Arc};
use util::{ResultExt, archive::extract_zip, fs::remove_matching, maybe, merge_json_value_into};
@ -83,20 +83,10 @@ impl super::LspAdapter for CLspAdapter {
"download failed with status {}",
response.status().to_string()
);
extract_zip(&container_dir, BufReader::new(response.body_mut()))
extract_zip(&container_dir, response.body_mut())
.await
.with_context(|| format!("unzipping clangd archive to {container_dir:?}"))?;
remove_matching(&container_dir, |entry| entry != version_dir).await;
// todo("windows")
#[cfg(not(windows))]
{
fs::set_permissions(
&binary_path,
<fs::Permissions as fs::unix::PermissionsExt>::from_mode(0o755),
)
.await?;
}
}
Ok(LanguageServerBinary {

View file

@ -442,11 +442,7 @@ impl LspAdapter for NodeVersionAdapter {
.await
.context("downloading release")?;
if version.url.ends_with(".zip") {
extract_zip(
&destination_container_path,
BufReader::new(response.body_mut()),
)
.await?;
extract_zip(&destination_container_path, response.body_mut()).await?;
} else if version.url.ends_with(".tar.gz") {
let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
let archive = Archive::new(decompressed_bytes);
@ -462,15 +458,6 @@ impl LspAdapter for NodeVersionAdapter {
&destination_path,
)
.await?;
// todo("windows")
#[cfg(not(windows))]
{
fs::set_permissions(
&destination_path,
<fs::Permissions as fs::unix::PermissionsExt>::from_mode(0o755),
)
.await?;
}
remove_matching(&container_dir, |entry| entry != destination_path).await;
}
Ok(LanguageServerBinary {

View file

@ -216,7 +216,7 @@ impl LspAdapter for RustLspAdapter {
})?;
}
AssetKind::Zip => {
extract_zip(&destination_path, BufReader::new(response.body_mut()))
extract_zip(&destination_path, response.body_mut())
.await
.with_context(|| {
format!("unzipping {} to {:?}", version.url, destination_path)

View file

@ -490,7 +490,7 @@ impl LspAdapter for EsLintLspAdapter {
})?;
}
AssetKind::Zip => {
extract_zip(&destination_path, BufReader::new(response.body_mut()))
extract_zip(&destination_path, response.body_mut())
.await
.with_context(|| {
format!("unzipping {} to {:?}", version.url, destination_path)