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

Refine project find's UX

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-02-25 15:27:34 +01:00
parent 51c645f6b4
commit f649074d36
6 changed files with 73 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/sum_tree/src/cursor.rs
View file

@ -34,13 +34,13 @@ where
stack: ArrayVec::new(),
position: D::default(),
did_seek: false,
at_end: false,
at_end: tree.is_empty(),
}
}
fn reset(&mut self) {
self.did_seek = false;
self.at_end = false;
self.at_end = self.tree.is_empty();
self.stack.truncate(0);
self.position = D::default();
}
@ -139,7 +139,7 @@ where
if self.at_end {
self.position = D::default();
self.descend_to_last_item(self.tree, cx);
self.at_end = false;
self.at_end = self.tree.is_empty();
} else {
while let Some(entry) = self.stack.pop() {
if entry.index > 0 {
@ -195,13 +195,15 @@ where
{
let mut descend = false;
if self.stack.is_empty() && !self.at_end {
self.stack.push(StackEntry {
tree: self.tree,
index: 0,
position: D::default(),
});
descend = true;
if self.stack.is_empty() {
if !self.at_end {
self.stack.push(StackEntry {
tree: self.tree,
index: 0,
position: D::default(),
});
descend = true;
}
self.did_seek = true;
}
@ -279,6 +281,10 @@ where
cx: &<T::Summary as Summary>::Context,
) {
self.did_seek = true;
if subtree.is_empty() {
return;
}
loop {
match subtree.0.as_ref() {
Node::Internal {
@ -298,7 +304,7 @@ where
subtree = child_trees.last().unwrap();
}
Node::Leaf { item_summaries, .. } => {
let last_index = item_summaries.len().saturating_sub(1);
let last_index = item_summaries.len() - 1;
for item_summary in &item_summaries[0..last_index] {
self.position.add_summary(item_summary, cx);
}

8
crates/sum_tree/src/sum_tree.rs
View file

@ -821,6 +821,14 @@ mod tests {
assert_eq!(cursor.item(), None);
assert_eq!(cursor.prev_item(), None);
assert_eq!(cursor.start().sum, 0);
cursor.prev(&());
assert_eq!(cursor.item(), None);
assert_eq!(cursor.prev_item(), None);
assert_eq!(cursor.start().sum, 0);
cursor.next(&());
assert_eq!(cursor.item(), None);
assert_eq!(cursor.prev_item(), None);
assert_eq!(cursor.start().sum, 0);
// Single-element tree
let mut tree = SumTree::<u8>::new();