Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

language_extension: Remove special handling for old TOML and Zig extensions (#64900)

Finn Eversbd747337d7be
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index 378e82a1609..8ca7a747d65 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -18,7 +18,7 @@ use lsp::{
};
use serde::Serialize;
use serde_json::Value;
-use util::{ResultExt, fs::make_file_executable, maybe, rel_path::RelPath};
+use util::{ResultExt, maybe, rel_path::RelPath};
use crate::{LanguageServerRegistryProxy, LspAccess};
@@ -215,21 +215,6 @@ impl DynLspInstaller for ExtensionLspAdapter {
};
let path = self.extension.path_from_extension(command_path);
- // TODO: This should now be done via the `zed::make_file_executable` function in
- // Zed extension API, but we're leaving these existing usages in place temporarily
- // to avoid any compatibility issues between Zed and the extension versions.
- //
- // We can remove once the following extension versions no longer see any use:
- if ["toml", "zig"].contains(&self.extension.manifest().id.as_ref())
- && path.starts_with(&self.extension.work_dir())
- {
- make_file_executable(&path)
- .await
- .context("failed to set file permissions")?;
- }
-
Ok(LanguageServerBinary {
path,
arguments: command