Rewrite goto_buffer

pull/975/head
Blaž Hrastnik 3 years ago
parent 78c68fae91
commit 7b65a6d687

@ -530,23 +530,29 @@ fn goto_previous_buffer(cx: &mut Context) {
}
fn goto_buffer(cx: &mut Context, direction: Direction) {
let buf_cur = current!(cx.editor).1.id();
let current = view!(cx.editor).doc;
if let Some(pos) = cx.editor.documents.iter().position(|(id, _)| id == buf_cur) {
let goto_id = if direction == Direction::Forward {
if pos < cx.editor.documents.iter().count() - 1 {
cx.editor.documents.iter().nth(pos + 1).unwrap().0
} else {
cx.editor.documents.iter().next().unwrap().0
let id = match direction {
Direction::Forward => {
let iter = cx.editor.documents.keys();
let mut iter = iter.skip_while(|id| *id != &current);
iter.next(); // skip current item
iter.next().or_else(|| cx.editor.documents.keys().next())
}
} else if pos > 0 {
cx.editor.documents.iter().nth(pos - 1).unwrap().0
} else {
cx.editor.documents.iter().last().unwrap().0
};
cx.editor.switch(goto_id, Action::Replace);
Direction::Backward => {
let iter = cx.editor.documents.keys();
let mut iter = iter.rev().skip_while(|id| *id != &current);
iter.next(); // skip current item
iter.next()
.or_else(|| cx.editor.documents.keys().rev().next())
}
}
.unwrap();
let id = *id;
cx.editor.switch(id, Action::Replace);
}
fn extend_to_line_start(cx: &mut Context) {
let (view, doc) = current!(cx.editor);

Loading…
Cancel
Save