From 9be3681f0eadf1bf4d459b9a3980678b2eee5488 Mon Sep 17 00:00:00 2001
From: Sofus Addington <sofus@addington.dk>
Date: Thu, 6 Mar 2025 19:08:02 +0100
Subject: [PATCH] Drop hashset and query for all open documents
---
helix-term/src/handlers/diagnostics.rs | 29 ++++++++++++++++----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/helix-term/src/handlers/diagnostics.rs b/helix-term/src/handlers/diagnostics.rs
index c04b6e9a..ac2df70a 100644
--- a/helix-term/src/handlers/diagnostics.rs
+++ b/helix-term/src/handlers/diagnostics.rs
@@ -1,4 +1,3 @@
-use std::collections::HashSet;
use std::time::Duration;
use helix_core::diagnostic::DiagnosticProvider;
@@ -58,15 +57,11 @@ pub(super) fn register_hooks(handlers: &Handlers) {
}
#[derive(Debug)]
-pub(super) struct PullDiagnosticsHandler {
- document_ids: HashSet<DocumentId>,
-}
+pub(super) struct PullDiagnosticsHandler {}
impl PullDiagnosticsHandler {
pub fn new() -> PullDiagnosticsHandler {
- PullDiagnosticsHandler {
- document_ids: [].into(),
- }
+ PullDiagnosticsHandler {}
}
}
@@ -82,14 +77,11 @@ impl helix_event::AsyncHook for PullDiagnosticsHandler {
dispatch_pull_diagnostic_for_document(event.document_id);
}
- self.document_ids.insert(event.document_id);
Some(Instant::now() + Duration::from_millis(500))
}
fn finish_debounce(&mut self) {
- for document_id in self.document_ids.clone() {
- dispatch_pull_diagnostic_for_document(document_id);
- }
+ dispatch_pull_diagnostic_for_open_documents();
}
}
@@ -108,6 +100,21 @@ fn dispatch_pull_diagnostic_for_document(document_id: DocumentId) {
})
}
+fn dispatch_pull_diagnostic_for_open_documents() {
+ job::dispatch_blocking(move |editor, _| {
+ let documents = editor.documents.values();
+
+ for document in documents {
+ let language_servers =
+ document.language_servers_with_feature(LanguageServerFeature::PullDiagnostics);
+
+ for language_server in language_servers {
+ pull_diagnostics_for_document(document, language_server);
+ }
+ }
+ })
+}
+
pub fn pull_diagnostics_for_document(
doc: &helix_view::Document,
language_server: &helix_lsp::Client,