Don't focus results editor on cmd-shift-f when there are no results

This commit is contained in:
Antonio Scandurra 2022-02-26 14:43:02 +01:00
parent afea5a3d5e
commit a78fe4ef6a

View file

@ -22,7 +22,6 @@ action!(ToggleFocus);
pub fn init(cx: &mut MutableAppContext) {
cx.add_bindings([
Binding::new("cmd-shift-F", ToggleFocus, Some("ProjectFindView")),
Binding::new("cmd-shift-F", ToggleFocus, Some("ProjectFindView")),
Binding::new("cmd-f", ToggleFocus, Some("ProjectFindView")),
Binding::new("cmd-shift-F", Deploy(true), Some("Workspace")),
@ -385,7 +384,9 @@ impl ProjectFindView {
fn toggle_focus(&mut self, _: &ToggleFocus, cx: &mut ViewContext<Self>) {
if self.query_editor.is_focused(cx) {
if !self.model.read(cx).highlighted_ranges.is_empty() {
cx.focus(&self.results_editor);
}
} else {
cx.focus(&self.query_editor);
}