Implement SemanticIndex::status and use it in project search

Co-Authored-By: Kyle Caverly <kyle@zed.dev>

crates/search/src/project_search.rs

@@ -20,12 +20,11 @@ use gpui::{
     Task, View, ViewContext, ViewHandle, WeakModelHandle, WeakViewHandle,
 };
 use menu::Confirm;
-use postage::stream::Stream;
 use project::{
     search::{PathMatcher, SearchInputs, SearchQuery},
     Entry, Project,
 };
-use semantic_index::SemanticIndex;
+use semantic_index::{SemanticIndex, SemanticIndexStatus};
 use smallvec::SmallVec;
 use std::{
     any::{Any, TypeId},
@@ -116,7 +115,7 @@ pub struct ProjectSearchView {
     model: ModelHandle<ProjectSearch>,
     query_editor: ViewHandle<Editor>,
     results_editor: ViewHandle<Editor>,
-    semantic_state: Option<SemanticSearchState>,
+    semantic_state: Option<SemanticState>,
     semantic_permissioned: Option<bool>,
     search_options: SearchOptions,
     panels_with_errors: HashSet<InputPanel>,
@@ -129,9 +128,9 @@ pub struct ProjectSearchView {
     current_mode: SearchMode,
 }
 
-struct SemanticSearchState {
+struct SemanticState {
-    pending_file_count: usize,
+    index_status: SemanticIndexStatus,
-    _progress_task: Task<()>,
+    _subscription: Subscription,
 }
 
 pub struct ProjectSearchBar {
@@ -316,11 +315,18 @@ impl View for ProjectSearchView {
                 }
             };
 
-            let semantic_status = self.semantic_state.as_ref().map(|semantic| {
+            let semantic_status = self.semantic_state.as_ref().and_then(|semantic| {
-                if semantic.pending_file_count > 0 {
+                let status = semantic.index_status;
-                    format!("Remaining files to index: {}", semantic.pending_file_count)
+                match status {
-                } else {
+                    SemanticIndexStatus::Indexed => Some("Indexing complete".to_string()),
-                    "Indexing complete".to_string()
+                    SemanticIndexStatus::Indexing { remaining_files } => {
+                        if remaining_files == 0 {
+                            Some(format!("Indexing..."))
+                        } else {
+                            Some(format!("Remaining files to index: {}", remaining_files))
+                        }
+                    }
+                    SemanticIndexStatus::NotIndexed => None,
                 }
             });
 
@@ -637,41 +643,29 @@ impl ProjectSearchView {
 
             let project = self.model.read(cx).project.clone();
 
-            let mut pending_file_count_rx = semantic_index.update(cx, |semantic_index, cx| {
+            semantic_index.update(cx, |semantic_index, cx| {
                 semantic_index
                     .index_project(project.clone(), cx)
                     .detach_and_log_err(cx);
-                semantic_index.pending_file_count(&project).unwrap()
             });
 
-            cx.spawn(|search_view, mut cx| async move {
+            self.semantic_state = Some(SemanticState {
-                search_view.update(&mut cx, |search_view, cx| {
+                index_status: semantic_index.read(cx).status(&project),
-                    cx.notify();
+                _subscription: cx.observe(&semantic_index, Self::semantic_index_changed),
-                    let pending_file_count = *pending_file_count_rx.borrow();
+            });
-                    search_view.semantic_state = Some(SemanticSearchState {
+            cx.notify();
-                        pending_file_count,
+        }
-                        _progress_task: cx.spawn(|search_view, mut cx| async move {
+    }
-                            while let Some(count) = pending_file_count_rx.recv().await {
+
-                                search_view
+    fn semantic_index_changed(
-                                    .update(&mut cx, |search_view, cx| {
+        &mut self,
-                                        if let Some(semantic_search_state) =
+        semantic_index: ModelHandle<SemanticIndex>,
-                                            &mut search_view.semantic_state
+        cx: &mut ViewContext<Self>,
-                                        {
+    ) {
-                                            semantic_search_state.pending_file_count = count;
+        let project = self.model.read(cx).project.clone();
-                                            cx.notify();
+        if let Some(semantic_state) = self.semantic_state.as_mut() {
-                                            if count == 0 {
+            semantic_state.index_status = semantic_index.read(cx).status(&project);
-                                                return;
+            cx.notify();
-                                            }
-                                        }
-                                    })
-                                    .ok();
-                            }
-                        }),
-                    });
-                })?;
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
         }
     }
 

crates/semantic_index/src/semantic_index.rs

@@ -109,6 +109,13 @@ pub fn init(
     .detach();
 }
 
+#[derive(Copy, Clone, Debug)]
+pub enum SemanticIndexStatus {
+    NotIndexed,
+    Indexed,
+    Indexing { remaining_files: usize },
+}
+
 pub struct SemanticIndex {
     fs: Arc<dyn Fs>,
     db: VectorDatabase,
@@ -124,7 +131,9 @@ struct ProjectState {
     worktrees: HashMap<WorktreeId, WorktreeState>,
     pending_file_count_rx: watch::Receiver<usize>,
     pending_file_count_tx: Arc<Mutex<watch::Sender<usize>>>,
+    pending_index: usize,
     _subscription: gpui::Subscription,
+    _observe_pending_file_count: Task<()>,
 }
 
 enum WorktreeState {
@@ -133,6 +142,10 @@ enum WorktreeState {
 }
 
 impl WorktreeState {
+    fn is_registered(&self) -> bool {
+        matches!(self, Self::Registered(_))
+    }
+
     fn paths_changed(
         &mut self,
         changes: Arc<[(Arc<Path>, ProjectEntryId, PathChange)]>,
@@ -207,14 +220,25 @@ impl JobHandle {
 }
 
 impl ProjectState {
-    fn new(subscription: gpui::Subscription) -> Self {
+    fn new(subscription: gpui::Subscription, cx: &mut ModelContext<SemanticIndex>) -> Self {
         let (pending_file_count_tx, pending_file_count_rx) = watch::channel_with(0);
         let pending_file_count_tx = Arc::new(Mutex::new(pending_file_count_tx));
         Self {
             worktrees: Default::default(),
-            pending_file_count_rx,
+            pending_file_count_rx: pending_file_count_rx.clone(),
             pending_file_count_tx,
+            pending_index: 0,
             _subscription: subscription,
+            _observe_pending_file_count: cx.spawn_weak({
+                let mut pending_file_count_rx = pending_file_count_rx.clone();
+                |this, mut cx| async move {
+                    while let Some(_) = pending_file_count_rx.next().await {
+                        if let Some(this) = this.upgrade(&cx) {
+                            this.update(&mut cx, |_, cx| cx.notify());
+                        }
+                    }
+                }
+            }),
         }
     }
 
@@ -257,6 +281,25 @@ impl SemanticIndex {
             && *RELEASE_CHANNEL != ReleaseChannel::Stable
     }
 
+    pub fn status(&self, project: &ModelHandle<Project>) -> SemanticIndexStatus {
+        if let Some(project_state) = self.projects.get(&project.downgrade()) {
+            if project_state
+                .worktrees
+                .values()
+                .all(|worktree| worktree.is_registered())
+                && project_state.pending_index == 0
+            {
+                SemanticIndexStatus::Indexed
+            } else {
+                SemanticIndexStatus::Indexing {
+                    remaining_files: project_state.pending_file_count_rx.borrow().clone(),
+                }
+            }
+        } else {
+            SemanticIndexStatus::NotIndexed
+        }
+    }
+
     async fn new(
         fs: Arc<dyn Fs>,
         database_path: PathBuf,
@@ -800,13 +843,15 @@ impl SemanticIndex {
                 }
                 _ => {}
             });
-            self.projects
+            let project_state = ProjectState::new(subscription, cx);
-                .insert(project.downgrade(), ProjectState::new(subscription));
+            self.projects.insert(project.downgrade(), project_state);
             self.project_worktrees_changed(project.clone(), cx);
         }
-        let project_state = &self.projects[&project.downgrade()];
+        let project_state = self.projects.get_mut(&project.downgrade()).unwrap();
-        let mut pending_file_count_rx = project_state.pending_file_count_rx.clone();
+        project_state.pending_index += 1;
+        cx.notify();
 
+        let mut pending_file_count_rx = project_state.pending_file_count_rx.clone();
         let db = self.db.clone();
         let language_registry = self.language_registry.clone();
         let parsing_files_tx = self.parsing_files_tx.clone();
@@ -917,6 +962,16 @@ impl SemanticIndex {
                 })
                 .await;
 
+            this.update(&mut cx, |this, cx| {
+                let project_state = this
+                    .projects
+                    .get_mut(&project.downgrade())
+                    .ok_or_else(|| anyhow!("project was dropped"))?;
+                project_state.pending_index -= 1;
+                cx.notify();
+                anyhow::Ok(())
+            })?;
+
             Ok(())
         })
     }