mirror of
https://github.com/zed-industries/zed.git
synced 2024-12-25 01:34:02 +00:00
Preserve matching history items and their order
This commit is contained in:
parent
541dd994a9
commit
57a95d1799
5 changed files with 151 additions and 16 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -2610,6 +2610,7 @@ dependencies = [
|
||||||
name = "file_finder"
|
name = "file_finder"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"collections",
|
||||||
"ctor",
|
"ctor",
|
||||||
"editor",
|
"editor",
|
||||||
"env_logger 0.9.3",
|
"env_logger 0.9.3",
|
||||||
|
|
|
@ -10,6 +10,7 @@ doctest = false
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
editor = { path = "../editor" }
|
editor = { path = "../editor" }
|
||||||
|
collections = { path = "../collections" }
|
||||||
fuzzy = { path = "../fuzzy" }
|
fuzzy = { path = "../fuzzy" }
|
||||||
gpui = { path = "../gpui" }
|
gpui = { path = "../gpui" }
|
||||||
menu = { path = "../menu" }
|
menu = { path = "../menu" }
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
|
use collections::{HashMap, HashSet};
|
||||||
use editor::{scroll::autoscroll::Autoscroll, Bias, Editor};
|
use editor::{scroll::autoscroll::Autoscroll, Bias, Editor};
|
||||||
use fuzzy::PathMatch;
|
use fuzzy::{CharBag, PathMatch, PathMatchCandidate};
|
||||||
use gpui::{
|
use gpui::{
|
||||||
actions, elements::*, AppContext, ModelHandle, MouseState, Task, ViewContext, WeakViewHandle,
|
actions, elements::*, AppContext, ModelHandle, MouseState, Task, ViewContext, WeakViewHandle,
|
||||||
};
|
};
|
||||||
|
@ -36,6 +37,10 @@ pub struct FileFinderDelegate {
|
||||||
enum Matches {
|
enum Matches {
|
||||||
History(Vec<FoundPath>),
|
History(Vec<FoundPath>),
|
||||||
Search(Vec<PathMatch>),
|
Search(Vec<PathMatch>),
|
||||||
|
Mixed {
|
||||||
|
history: Vec<FoundPath>,
|
||||||
|
search: Vec<PathMatch>,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
@ -49,6 +54,7 @@ impl Matches {
|
||||||
match self {
|
match self {
|
||||||
Self::History(items) => items.len(),
|
Self::History(items) => items.len(),
|
||||||
Self::Search(items) => items.len(),
|
Self::Search(items) => items.len(),
|
||||||
|
Self::Mixed { history, search } => history.len() + search.len(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,6 +62,103 @@ impl Matches {
|
||||||
match self {
|
match self {
|
||||||
Self::History(items) => items.get(index).map(Match::History),
|
Self::History(items) => items.get(index).map(Match::History),
|
||||||
Self::Search(items) => items.get(index).map(Match::Search),
|
Self::Search(items) => items.get(index).map(Match::Search),
|
||||||
|
Self::Mixed { history, search } => {
|
||||||
|
if index < history.len() {
|
||||||
|
history.get(index).map(Match::History)
|
||||||
|
} else {
|
||||||
|
search.get(index - history.len()).map(Match::Search)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn push_new_matches(
|
||||||
|
&mut self,
|
||||||
|
query: &PathLikeWithPosition<FileSearchQuery>,
|
||||||
|
mut new_search_matches: Vec<PathMatch>,
|
||||||
|
extend_old_matches: bool,
|
||||||
|
) {
|
||||||
|
match self {
|
||||||
|
Matches::Search(search_matches) => {
|
||||||
|
if extend_old_matches {
|
||||||
|
util::extend_sorted(
|
||||||
|
search_matches,
|
||||||
|
new_search_matches.into_iter(),
|
||||||
|
100,
|
||||||
|
|a, b| b.cmp(a),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
*search_matches = new_search_matches;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Matches::History(history_matches) => {
|
||||||
|
*self = Matches::Mixed {
|
||||||
|
history: std::mem::take(history_matches),
|
||||||
|
search: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Matches::Mixed { .. } => {}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Matches::Mixed { history, search } = self {
|
||||||
|
let history_paths = history
|
||||||
|
.iter()
|
||||||
|
.map(|h| &h.project.path)
|
||||||
|
.collect::<HashSet<_>>();
|
||||||
|
new_search_matches.retain(|path_match| !history_paths.contains(&path_match.path));
|
||||||
|
|
||||||
|
if extend_old_matches {
|
||||||
|
util::extend_sorted(search, new_search_matches.into_iter(), 100, |a, b| b.cmp(a))
|
||||||
|
} else {
|
||||||
|
let candidates_by_worktrees = history
|
||||||
|
.iter()
|
||||||
|
.map(|found_path| {
|
||||||
|
let path = &found_path.project.path;
|
||||||
|
let candidate = PathMatchCandidate {
|
||||||
|
path,
|
||||||
|
char_bag: CharBag::from_iter(
|
||||||
|
path.to_string_lossy().to_lowercase().chars(),
|
||||||
|
),
|
||||||
|
};
|
||||||
|
(found_path.project.worktree_id, candidate)
|
||||||
|
})
|
||||||
|
.fold(
|
||||||
|
HashMap::default(),
|
||||||
|
|mut candidates, (worktree_id, new_candidate)| {
|
||||||
|
candidates
|
||||||
|
.entry(worktree_id)
|
||||||
|
.or_insert_with(Vec::new)
|
||||||
|
.push(new_candidate);
|
||||||
|
candidates
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
let mut matching_history_paths = HashSet::default();
|
||||||
|
for (worktree, candidates) in candidates_by_worktrees {
|
||||||
|
let max_results = candidates.len() + 1;
|
||||||
|
matching_history_paths.extend(
|
||||||
|
fuzzy::match_fixed_path_set(
|
||||||
|
candidates,
|
||||||
|
worktree.to_usize(),
|
||||||
|
query.path_like.path_query(),
|
||||||
|
false,
|
||||||
|
max_results,
|
||||||
|
)
|
||||||
|
.into_iter()
|
||||||
|
.map(|path_match| path_match.path),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
history.retain(|history_path| {
|
||||||
|
matching_history_paths.contains(&history_path.project.path)
|
||||||
|
});
|
||||||
|
if history.is_empty() {
|
||||||
|
*self = Matches::Search(new_search_matches);
|
||||||
|
} else {
|
||||||
|
*search = new_search_matches;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -271,24 +374,14 @@ impl FileFinderDelegate {
|
||||||
) {
|
) {
|
||||||
if search_id >= self.latest_search_id {
|
if search_id >= self.latest_search_id {
|
||||||
self.latest_search_id = search_id;
|
self.latest_search_id = search_id;
|
||||||
if self.latest_search_did_cancel
|
let extend_old_matches = self.latest_search_did_cancel
|
||||||
&& Some(query.path_like.path_query())
|
&& Some(query.path_like.path_query())
|
||||||
== self
|
== self
|
||||||
.latest_search_query
|
.latest_search_query
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(|query| query.path_like.path_query())
|
.map(|query| query.path_like.path_query());
|
||||||
{
|
self.matches
|
||||||
match &mut self.matches {
|
.push_new_matches(&query, matches, extend_old_matches);
|
||||||
Matches::History(_) => self.matches = Matches::Search(matches),
|
|
||||||
Matches::Search(search_matches) => {
|
|
||||||
util::extend_sorted(search_matches, matches.into_iter(), 100, |a, b| {
|
|
||||||
b.cmp(a)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
self.matches = Matches::Search(matches);
|
|
||||||
}
|
|
||||||
self.latest_search_query = Some(query);
|
self.latest_search_query = Some(query);
|
||||||
self.latest_search_did_cancel = did_cancel;
|
self.latest_search_did_cancel = did_cancel;
|
||||||
cx.notify();
|
cx.notify();
|
||||||
|
|
|
@ -4,5 +4,7 @@ mod paths;
|
||||||
mod strings;
|
mod strings;
|
||||||
|
|
||||||
pub use char_bag::CharBag;
|
pub use char_bag::CharBag;
|
||||||
pub use paths::{match_path_sets, PathMatch, PathMatchCandidate, PathMatchCandidateSet};
|
pub use paths::{
|
||||||
|
match_fixed_path_set, match_path_sets, PathMatch, PathMatchCandidate, PathMatchCandidateSet,
|
||||||
|
};
|
||||||
pub use strings::{match_strings, StringMatch, StringMatchCandidate};
|
pub use strings::{match_strings, StringMatch, StringMatchCandidate};
|
||||||
|
|
|
@ -90,6 +90,44 @@ impl Ord for PathMatch {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn match_fixed_path_set(
|
||||||
|
candidates: Vec<PathMatchCandidate>,
|
||||||
|
worktree_id: usize,
|
||||||
|
query: &str,
|
||||||
|
smart_case: bool,
|
||||||
|
max_results: usize,
|
||||||
|
) -> Vec<PathMatch> {
|
||||||
|
let lowercase_query = query.to_lowercase().chars().collect::<Vec<_>>();
|
||||||
|
let query = query.chars().collect::<Vec<_>>();
|
||||||
|
let query_char_bag = CharBag::from(&lowercase_query[..]);
|
||||||
|
|
||||||
|
let mut matcher = Matcher::new(
|
||||||
|
&query,
|
||||||
|
&lowercase_query,
|
||||||
|
query_char_bag,
|
||||||
|
smart_case,
|
||||||
|
max_results,
|
||||||
|
);
|
||||||
|
|
||||||
|
let mut results = Vec::new();
|
||||||
|
matcher.match_candidates(
|
||||||
|
&[],
|
||||||
|
&[],
|
||||||
|
candidates.into_iter(),
|
||||||
|
&mut results,
|
||||||
|
&AtomicBool::new(false),
|
||||||
|
|candidate, score| PathMatch {
|
||||||
|
score,
|
||||||
|
worktree_id,
|
||||||
|
positions: Vec::new(),
|
||||||
|
path: candidate.path.clone(),
|
||||||
|
path_prefix: Arc::from(""),
|
||||||
|
distance_to_relative_ancestor: usize::MAX,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
results
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn match_path_sets<'a, Set: PathMatchCandidateSet<'a>>(
|
pub async fn match_path_sets<'a, Set: PathMatchCandidateSet<'a>>(
|
||||||
candidate_sets: &'a [Set],
|
candidate_sets: &'a [Set],
|
||||||
query: &str,
|
query: &str,
|
||||||
|
|
Loading…
Reference in a new issue