vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

sum_tree: Implement Iterator::last and lower bound of Iterator::size_hint (#49448)

Browse source 
Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Lukas Wirth 2026-02-18 10:52:52 +01:00 committed by GitHub
parent 8244a5c6ed
commit 0b3a23c357
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -586,9 +586,8 @@ impl<'a, T: Item> Iterator for Iter<'a, T> {
descend = true;
}
while !self.stack.is_empty() {
while let Some(entry) = self.stack.last_mut() {
let new_subtree = {
let entry = self.stack.last_mut().unwrap();
match entry.tree.0.as_ref() {
Node::Internal { child_trees, .. } => {
if !descend {
@ -625,6 +624,20 @@ impl<'a, T: Item> Iterator for Iter<'a, T> {
None
}
fn last(mut self) -> Option<Self::Item> {
self.stack.clear();
self.tree.rightmost_leaf().last()
}
fn size_hint(&self) -> (usize, Option<usize>) {
let lower_bound = match self.stack.last() {
Some(top) => top.tree.0.child_summaries().len() - top.index as usize,
None => self.tree.0.child_summaries().len(),
};
(lower_bound, None)
}
}
impl<'a, 'b, T: Item, D> Iterator for Cursor<'a, 'b, T, D>

4
crates/vim/src/state.rs
View file

@ -612,9 +612,7 @@ impl MarksState {
return Some(Mark::Local(anchors.get(name)?.clone()));
}
let singleton = multi_buffer.read(cx).as_singleton()?;
let excerpt_id = *multi_buffer.read(cx).excerpt_ids().first()?;
let buffer_id = singleton.read(cx).remote_id();
let (excerpt_id, buffer_id, _) = multi_buffer.read(cx).read(cx).as_singleton()?;
if let Some(anchors) = self.buffer_marks.get(&buffer_id) {
let text_anchors = anchors.get(name)?;
let anchors = text_anchors