Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Associate StringMatchCandidate with an id

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-01-14 14:55:03 +01:00
parent e538beb920
commit be24e58926
5 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/language/src/outline.rs
View file

@ -21,7 +21,9 @@ impl<T> Outline<T> {
Self {
candidates: items
.iter()
.map(|item| StringMatchCandidate {
.enumerate()
.map(|(id, item)| StringMatchCandidate {
id,
char_bag: item.text.as_str().into(),
string: item.text.clone(),
})
@ -37,19 +39,19 @@ impl<T> Outline<T> {
true,
100,
&Default::default(),
executor,
executor.clone(),
)
.await;
matches.sort_unstable_by_key(|m| m.candidate_index);
matches.sort_unstable_by_key(|m| m.candidate_id);
let mut tree_matches = Vec::new();
let mut prev_item_ix = 0;
for string_match in matches {
let outline_match = &self.items[string_match.candidate_index];
let outline_match = &self.items[string_match.candidate_id];
let insertion_ix = tree_matches.len();
let mut cur_depth = outline_match.depth;
for (ix, item) in self.items[prev_item_ix..string_match.candidate_index]
for (ix, item) in self.items[prev_item_ix..string_match.candidate_id]
.iter()
.enumerate()
.rev()
@ -63,7 +65,7 @@ impl<T> Outline<T> {
tree_matches.insert(
insertion_ix,
StringMatch {
candidate_index,
candidate_id: candidate_index,
score: Default::default(),
positions: Default::default(),
string: Default::default(),
@ -73,7 +75,7 @@ impl<T> Outline<T> {
}
}
prev_item_ix = string_match.candidate_index + 1;
prev_item_ix = string_match.candidate_id + 1;
tree_matches.push(string_match);
}

7
crates/language/src/tests.rs
View file

@ -401,12 +401,7 @@ async fn test_outline(mut cx: gpui::TestAppContext) {
.await;
matches
.into_iter()
.map(|mat| {
(
outline.items[mat.candidate_index].text.as_str(),
mat.positions,
)
})
.map(|mat| (outline.items[mat.candidate_id].text.as_str(), mat.positions))
.collect::<Vec<_>>()
}
}