From 1d55872e7a48822643cca0c6d9087084959cdc8f Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Sat, 29 Jan 2022 14:38:58 +0100
Subject: [PATCH] Display active match and allow going to next or previous
 match

We still need to write a unit test for this, as well as add a keybinding.
---
 crates/find/src/find.rs             | 35 ++++++++++++++++++++++++-----
 crates/theme/src/theme.rs           |  1 +
 crates/zed/assets/themes/_base.toml |  3 +++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/crates/find/src/find.rs b/crates/find/src/find.rs
index 434056b9a96d632f458ea3ba70378aa856610e95..fe91af58bede507f4bfdd5a8503660837f4c8b4e 100644
--- a/crates/find/src/find.rs
+++ b/crates/find/src/find.rs
@@ -1,7 +1,7 @@
 use aho_corasick::AhoCorasickBuilder;
 use anyhow::Result;
 use collections::HashSet;
-use editor::{char_kind, Anchor, Editor, EditorSettings, MultiBufferSnapshot};
+use editor::{char_kind, Anchor, Autoscroll, Editor, EditorSettings, MultiBufferSnapshot};
 use gpui::{
     action, elements::*, keymap::Binding, Entity, MutableAppContext, RenderContext, Subscription,
     Task, View, ViewContext, ViewHandle, WeakViewHandle,
@@ -9,7 +9,11 @@ use gpui::{
 use postage::watch;
 use regex::RegexBuilder;
 use smol::future::yield_now;
-use std::{cmp::Ordering, ops::Range, sync::Arc};
+use std::{
+    cmp::{self, Ordering},
+    ops::Range,
+    sync::Arc,
+};
 use workspace::{ItemViewHandle, Settings, Toolbar, Workspace};
 
 action!(Deploy);
@@ -99,6 +103,20 @@ impl View for FindBar {
                     .with_child(self.render_nav_button(">", Direction::Next, theme, cx))
                     .boxed(),
             )
+            .with_children(self.active_editor.as_ref().and_then(|editor| {
+                let (_, highlighted_ranges) =
+                    editor.read(cx).highlighted_ranges_for_type::<Self>()?;
+                let match_ix = cmp::min(self.active_match_index? + 1, highlighted_ranges.len());
+                Some(
+                    Label::new(
+                        format!("{} of {}", match_ix, highlighted_ranges.len()),
+                        theme.match_index.text.clone(),
+                    )
+                    .contained()
+                    .with_style(theme.match_index.container)
+                    .boxed(),
+                )
+            }))
             .contained()
             .with_style(theme.container)
             .boxed()
@@ -273,12 +291,16 @@ impl FindBar {
                                 }
                             }
                             Direction::Next => {
-                                index += 1;
-                                if index >= ranges.len() {
+                                if index == ranges.len() - 1 {
                                     index = 0;
+                                } else {
+                                    index += 1;
                                 }
                             }
                         }
+
+                        let range_to_select = ranges[index].clone();
+                        editor.select_ranges([range_to_select], Some(Autoscroll::Fit), cx);
                     }
                 });
             }
@@ -312,14 +334,13 @@ impl FindBar {
 
     fn on_active_editor_event(
         &mut self,
-        editor: ViewHandle<Editor>,
+        _: ViewHandle<Editor>,
         event: &editor::Event,
         cx: &mut ViewContext<Self>,
     ) {
         match event {
             editor::Event::Edited => self.update_matches(cx),
             editor::Event::SelectionsChanged => self.update_match_index(cx),
-
             _ => {}
         }
     }
@@ -329,6 +350,7 @@ impl FindBar {
         self.pending_search.take();
         if let Some(editor) = self.active_editor.as_ref() {
             if query.is_empty() {
+                self.active_match_index.take();
                 editor.update(cx, |editor, cx| editor.clear_highlighted_ranges::<Self>(cx));
             } else {
                 let buffer = editor.read(cx).buffer().read(cx).snapshot(cx);
@@ -376,6 +398,7 @@ impl FindBar {
 
     fn update_match_index(&mut self, cx: &mut ViewContext<Self>) {
         self.active_match_index = self.active_match_index(cx);
+        cx.notify();
     }
 
     fn active_match_index(&mut self, cx: &mut ViewContext<Self>) -> Option<usize> {
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index d9fab286b00f2e78ba3a997c7ef60a2292c818eb..37414eca2f924784b213e95b780f1bde602f3cab 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -100,6 +100,7 @@ pub struct Find {
     pub hovered_mode_button: ContainedText,
     pub active_hovered_mode_button: ContainedText,
     pub match_background: Color,
+    pub match_index: ContainedText,
 }
 
 #[derive(Clone, Deserialize, Default)]
diff --git a/crates/zed/assets/themes/_base.toml b/crates/zed/assets/themes/_base.toml
index c88c4bf3d868c4d5426281c2e89f74642ee80335..360d5d03e113c15dbf91a354f03280bfafe84abc 100644
--- a/crates/zed/assets/themes/_base.toml
+++ b/crates/zed/assets/themes/_base.toml
@@ -342,6 +342,9 @@ background = "$surface.2"
 extends = "$find.mode_button"
 background = "$surface.2"
 
+[find.match_index]
+extends = "$text.1"
+
 [find.editor]
 max_width = 400
 background = "$surface.0"