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 case for PHP language IDs (#65048)

Finn Evers0c70487f830b
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index 33f6201a6db..18241a94235 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -287,16 +287,6 @@ impl LspAdapter for ExtensionLspAdapter {
}
fn language_ids(&self) -> HashMap<LanguageName, String> {
- // TODO: The language IDs can be provided via the language server options
- // in `extension.toml now 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 self.extension.manifest().id.as_ref() == "php" {
- return HashMap::from_iter([(LanguageName::new_static("PHP"), "php".into())]);
- }
-
self.extension
.manifest()
.language_servers
@@ -436,9 +426,7 @@ impl LspAdapter for ExtensionLspAdapter {
async fn additional_workspace_configuration(
self: Arc<Self>,
target_language_server_id: LanguageServerName,
-
delegate: &Arc<dyn LspAdapterDelegate>,
-
_cx: &mut AsyncApp,
) -> Result<Option<serde_json::Value>> {
let language_server_status_source = delegate.status_source_id();