1969487 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

When buffer closes, focus on parent buffer (#4766)

1969487wes adams4 years ago

helix-view/src/tree.rs+38−1

compare with master

unifiedsplit

@@ -219,7 +219,7 @@ impl Tree {

219

220 if self.focus == index {

221 // focus on something else

222− self.focus = self.next();

222+ self.focus = self.prev();

223 }

224

225 stack.push(index);

@@ -521,6 +521,26 @@ impl Tree {

521 Some(child_id)

522 }

523

524+ pub fn prev(&self) -> ViewId {

525+ // This function is very dumb, but that's because we don't store any parent links.

526+ // (we'd be able to go parent.prev_sibling() recursively until we find something)

527+ // For now that's okay though, since it's unlikely you'll be able to open a large enough

528+ // number of splits to notice.

529+

530+ let mut views = self

531+ .traverse()

532+ .rev()

533+ .skip_while(|&(id, _view)| id != self.focus)

534+ .skip(1); // Skip focused value

535+ if let Some((id, _)) = views.next() {

536+ id

537+ } else {

538+ // extremely crude, take the last item

539+ let (key, _) = self.traverse().rev().next().unwrap();

540+ key

541+ }

542+ }

543+

524 pub fn next(&self) -> ViewId {

544 pub fn next(&self) -> ViewId {

525 // This function is very dumb, but that's because we don't store any parent links.

545 // This function is very dumb, but that's because we don't store any parent links.

526 // (we'd be able to go parent.next_sibling() recursively until we find something)

546 // (we'd be able to go parent.next_sibling() recursively until we find something)

@@ -661,6 +681,23 @@ impl<'a> Iterator for Traverse<'a> {

661 }

681 }

662}

682}

663

683

684+impl<'a> DoubleEndedIterator for Traverse<'a> {

685+ fn next_back(&mut self) -> Option<Self::Item> {

686+ loop {

687+ let key = self.stack.pop()?;

688+

689+ let node = &self.tree.nodes[key];

690+

691+ match &node.content {

692+ Content::View(view) => return Some((key, view)),

693+ Content::Container(container) => {

694+ self.stack.extend(container.children.iter());

695+ }

696+ }

697+ }

698+ }

699+}

700+

664#[cfg(test)]

701#[cfg(test)]

665mod test {

702mod test {

666 use super::*;

703 use super::*;