From 75ebaabc2ccee127d65abea0383f546dc85014a2 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 3 Nov 2022 18:01:14 -0700 Subject: [PATCH] Merge pull request #1853 from zed-industries/diagnostics-focus-loop Fix infinite focus transfer loop in project diagnostics --- crates/diagnostics/src/diagnostics.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs index 4409fa17ad3669806ca1556a83a69d6a5e58fd87..015339e4d3f7697351a2ef77d75bad1d3ef00beb 100644 --- a/crates/diagnostics/src/diagnostics.rs +++ b/crates/diagnostics/src/diagnostics.rs @@ -100,7 +100,7 @@ impl View for ProjectDiagnosticsEditor { } fn focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext) { - if !self.path_states.is_empty() { + if cx.is_self_focused() && !self.path_states.is_empty() { cx.focus(&self.editor); } }