zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-10 05:37:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use OutlineItem::depth to include ancestors of matching candidates

Browse Source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-01-13 16:59:52 +01:00
parent aee3bb98f2
commit e165f1e16c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/language/src/outline.rs
View File

@ -55,24 +55,29 @@ impl Outline {
*position += outline_match.name_range_in_text.start;
}
let mut cur_depth = outline_match.depth;
for (ix, item) in self.items[prev_item_ix..string_match.candidate_index]
.iter()
.enumerate()
.rev()
{
if cur_depth == 0 {
break;
}
let candidate_index = ix + prev_item_ix;
if item.range.contains(&outline_match.range.start)
&& item.range.contains(&outline_match.range.end)
{
if item.depth == cur_depth - 1 {
tree_matches.push(StringMatch {
candidate_index,
score: Default::default(),
positions: Default::default(),
string: Default::default(),
});
cur_depth -= 1;
}
}
prev_item_ix = string_match.candidate_index;
prev_item_ix = string_match.candidate_index + 1;
tree_matches.push(string_match);
}