zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-09 21:26:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow searching before indexing is complete

Browse Source 
Co-Authored-By: Kyle Caverly <kyle@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-09-07 19:04:45 +02:00
parent 65e17e212d
commit 47d7aa0b91
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/search/src/project_search.rs
View File

@ -230,7 +230,7 @@ impl ProjectSearch {
self.search_id += 1; self.search_id += 1;
self.match_ranges.clear(); self.match_ranges.clear();
self.search_history.add(inputs.as_str().to_string()); self.search_history.add(inputs.as_str().to_string());
self.no_results = Some(true); self.no_results = None;
self.pending_search = Some(cx.spawn(|this, mut cx| async move { self.pending_search = Some(cx.spawn(|this, mut cx| async move {
let results = search?.await.log_err()?; let results = search?.await.log_err()?;
let matches = results let matches = results
@ -238,9 +238,10 @@ impl ProjectSearch {
.map(|result| (result.buffer, vec![result.range.start..result.range.start])); .map(|result| (result.buffer, vec![result.range.start..result.range.start]));
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
this.no_results = Some(true);
this.excerpts.update(cx, |excerpts, cx| { this.excerpts.update(cx, |excerpts, cx| {
excerpts.clear(cx); excerpts.clear(cx);
}) });
}); });
for (buffer, ranges) in matches { for (buffer, ranges) in matches {
let mut match_ranges = this.update(&mut cx, |this, cx| { let mut match_ranges = this.update(&mut cx, |this, cx| {
@ -315,15 +316,13 @@ impl View for ProjectSearchView {
} }
}; };
let semantic_status = if let Some(semantic) = &self.semantic_state { let semantic_status = self.semantic_state.as_ref().map(|semantic| {
if semantic.pending_file_count > 0 { if semantic.pending_file_count > 0 {
format!("Remaining files to index: {}", semantic.pending_file_count) format!("Remaining files to index: {}", semantic.pending_file_count)
} else { } else {
"Indexing complete".to_string() "Indexing complete".to_string()
} }
} else { });
"Indexing: ...".to_string()
};
let minor_text = if let Some(no_results) = model.no_results { let minor_text = if let Some(no_results) = model.no_results {
if model.pending_search.is_none() && no_results { if model.pending_search.is_none() && no_results {
@ -333,12 +332,16 @@ impl View for ProjectSearchView {
} }
} else { } else {
match current_mode { match current_mode {
SearchMode::Semantic => vec![ SearchMode::Semantic => {
"".to_owned(), let mut minor_text = Vec::new();
semantic_status, minor_text.push("".into());
"Simply explain the code you are looking to find.".to_owned(), minor_text.extend(semantic_status);
"ex. 'prompt user for permissions to index their project'".to_owned(), minor_text.push("Simply explain the code you are looking to find.".into());
], minor_text.push(
"ex. 'prompt user for permissions to index their project'".into(),
);
minor_text
}
_ => vec![ _ => vec![
"".to_owned(), "".to_owned(),
"Include/exclude specific paths with the filter option.".to_owned(), "Include/exclude specific paths with the filter option.".to_owned(),
@ -952,11 +955,7 @@ impl ProjectSearchView {
let mode = self.current_mode; let mode = self.current_mode;
match mode { match mode {
SearchMode::Semantic => { SearchMode::Semantic => {
if let Some(semantic) = &mut self.semantic_state { if self.semantic_state.is_some() {
if semantic.pending_file_count > 0 {
return;
}
if let Some(query) = self.build_search_query(cx) { if let Some(query) = self.build_search_query(cx) {
self.model self.model
.update(cx, |model, cx| model.semantic_search(query.as_inner(), cx)); .update(cx, |model, cx| model.semantic_search(query.as_inner(), cx));