Merge branch 'main' into window_context_2

2023-04-21 10:58:08 +02:00
parent d32a7218cd 8e4cc549dc
commit c76b9794e4
45 changed files with 1760 additions and 882 deletions
@@ -7,6 +7,7 @@ use gpui::{
    WeakViewHandle,
 };
 use language::Diagnostic;
+use lsp::LanguageServerId;
 use project::Project;
 use settings::Settings;
 use workspace::{item::ItemHandle, StatusItemView};
@@ -15,7 +16,7 @@ pub struct DiagnosticIndicator {
    summary: project::DiagnosticSummary,
    active_editor: Option<WeakViewHandle<Editor>>,
    current_diagnostic: Option<Diagnostic>,
-    in_progress_checks: HashSet<usize>,
+    in_progress_checks: HashSet<LanguageServerId>,
    _observe_active_editor: Option<Subscription>,
 }