Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Fix diagnostics in editor control enabling by itself (#52907)
Om Chillured320e0b76853
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rsindex c625a3b97af..dca22e31bff 100644--- a/crates/editor/src/editor.rs+++ b/crates/editor/src/editor.rs@@ -20580,11 +20580,11 @@ impl Editor {window: &mut Window,cx: &mut Context<Editor>,) {- if !self.diagnostics_enabled() {- return;- }+ let diagnostics_enabled =+ self.diagnostics_enabled() && self.diagnostics_max_severity != DiagnosticSeverity::Off;+ self.diagnostics_enabled = !diagnostics_enabled;- let new_severity = if self.diagnostics_max_severity == DiagnosticSeverity::Off {+ let new_severity = if self.diagnostics_enabled {EditorSettings::get_global(cx).diagnostics_max_severity.filter(|severity| severity != &DiagnosticSeverity::Off)@@ -20593,7 +20593,7 @@ impl Editor {DiagnosticSeverity::Off};self.set_max_diagnostics_severity(new_severity, cx);- if self.diagnostics_max_severity == DiagnosticSeverity::Off {+ if self.diagnostics_enabled {self.active_diagnostics = ActiveDiagnostic::None;self.inline_diagnostics_update = Task::ready(());self.inline_diagnostics.clear();diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rsindex b0ea1b86740..7f6ddf9dfa9 100644--- a/crates/editor/src/editor_tests.rs+++ b/crates/editor/src/editor_tests.rs@@ -37367,3 +37367,44 @@ fn setup_syntax_highlighting_with_theme();});}++#[gpui::test]+async fn test_toggle_diagnostics_persists_across_settings_change(cx: &mut TestAppContext) {+ init_test(cx, |_| {});+ let mut cx = EditorTestContext::new(cx).await;++ cx.update_editor(|editor, _, _| {+ assert!(+ editor.diagnostics_enabled(),+ "diagnostics should start enabled by default"+ );+ });++ cx.update_editor(|editor, window, cx| {+ editor.toggle_diagnostics(&actions::ToggleDiagnostics, window, cx);+ assert!(+ !editor.diagnostics_enabled(),+ "diagnostics should be disabled after toggle"+ );+ });++ update_test_editor_settings(&mut cx, &|settings| {+ settings.cursor_blink = Some(false);+ });+ cx.run_until_parked();++ cx.update_editor(|editor, _, _| {+ assert!(+ !editor.diagnostics_enabled(),+ "diagnostics should remain disabled after settings change"+ );+ });++ cx.update_editor(|editor, window, cx| {+ editor.toggle_diagnostics(&actions::ToggleDiagnostics, window, cx);+ assert!(+ editor.diagnostics_enabled(),+ "diagnostics should be re-enabled after second toggle"+ );+ });+}diff --git a/crates/zed/src/zed/quick_action_bar.rs b/crates/zed/src/zed/quick_action_bar.rsindex 0f6864e6fa3..d1ffb58b792 100644--- a/crates/zed/src/zed/quick_action_bar.rs+++ b/crates/zed/src/zed/quick_action_bar.rs@@ -120,7 +120,8 @@ impl Render for QuickActionBar {let semantic_highlights_enabled = editor_value.semantic_highlights_enabled();let code_lens_enabled = editor_value.code_lens_enabled();let is_full = editor_value.mode().is_full();- let diagnostics_enabled = editor_value.diagnostics_max_severity != DiagnosticSeverity::Off;+ let diagnostics_enabled = editor_value.diagnostics_enabled()+ && editor_value.diagnostics_max_severity != DiagnosticSeverity::Off;let supports_inline_diagnostics = editor_value.inline_diagnostics_enabled();let inline_diagnostics_enabled = editor_value.show_inline_diagnostics();let git_blame_inline_enabled = editor_value.git_blame_inline_enabled();