From 8ca012765883d89b5e59cf9f5dcf5b0c90b7f706 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Fri, 3 Jun 2022 10:56:26 +0200 Subject: [PATCH] Make `LspAdapter::process_diagnostics` optional --- crates/language/src/language.rs | 3 ++- crates/zed/src/languages/c.rs | 2 -- crates/zed/src/languages/cpp.rs | 2 -- crates/zed/src/languages/json.rs | 2 -- crates/zed/src/languages/typescript.rs | 2 -- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs index b9d28c76a1..00f86a2488 100644 --- a/crates/language/src/language.rs +++ b/crates/language/src/language.rs @@ -77,7 +77,8 @@ pub trait LspAdapter: 'static + Send + Sync { container_dir: PathBuf, ) -> BoxFuture<'static, Result>; fn cached_server_binary(&self, container_dir: PathBuf) -> BoxFuture<'static, Option>; - fn process_diagnostics(&self, diagnostics: &mut lsp::PublishDiagnosticsParams); + + fn process_diagnostics(&self, _: &mut lsp::PublishDiagnosticsParams) {} fn label_for_completion(&self, _: &lsp::CompletionItem, _: &Language) -> Option { None diff --git a/crates/zed/src/languages/c.rs b/crates/zed/src/languages/c.rs index 974742ad33..a411c34f2d 100644 --- a/crates/zed/src/languages/c.rs +++ b/crates/zed/src/languages/c.rs @@ -105,6 +105,4 @@ impl super::LspAdapter for CLspAdapter { .log_err() .boxed() } - - fn process_diagnostics(&self, _: &mut lsp::PublishDiagnosticsParams) {} } diff --git a/crates/zed/src/languages/cpp.rs b/crates/zed/src/languages/cpp.rs index d6e4bf0819..f624c0e930 100644 --- a/crates/zed/src/languages/cpp.rs +++ b/crates/zed/src/languages/cpp.rs @@ -30,6 +30,4 @@ impl super::LspAdapter for CppLspAdapter { fn cached_server_binary(&self, container_dir: PathBuf) -> BoxFuture<'static, Option> { super::c::CLspAdapter.cached_server_binary(container_dir) } - - fn process_diagnostics(&self, _: &mut lsp::PublishDiagnosticsParams) {} } diff --git a/crates/zed/src/languages/json.rs b/crates/zed/src/languages/json.rs index 5bbaba8d90..dab6922c71 100644 --- a/crates/zed/src/languages/json.rs +++ b/crates/zed/src/languages/json.rs @@ -120,8 +120,6 @@ impl LspAdapter for JsonLspAdapter { .boxed() } - fn process_diagnostics(&self, _: &mut lsp::PublishDiagnosticsParams) {} - fn initialization_options(&self) -> Option { Some(json!({ "provideFormatter": true diff --git a/crates/zed/src/languages/typescript.rs b/crates/zed/src/languages/typescript.rs index 79c74c521d..96682d26d7 100644 --- a/crates/zed/src/languages/typescript.rs +++ b/crates/zed/src/languages/typescript.rs @@ -113,8 +113,6 @@ impl LspAdapter for TypeScriptLspAdapter { .boxed() } - fn process_diagnostics(&self, _: &mut lsp::PublishDiagnosticsParams) {} - fn label_for_completion( &self, item: &lsp::CompletionItem,