andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Use indices to simplify goto_buffer

Browse Source
This commit is contained in:
emilylime 2024-09-25 20:55:19 +03:00
parent 8373919e6d
commit f943fb947e
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
helix-term/src/commands.rs
View File

@ -868,33 +868,24 @@ fn goto_previous_buffer(cx: &mut Context) {
}
fn goto_buffer(editor: &mut Editor, direction: Direction, count: usize) {
let current = view!(editor).doc;
let index = editor.focused_document_index();
let len = editor.documents.len();
let id = match direction {
Direction::Forward => {
let iter = editor.documents.keys();
// skip 'count' times past current buffer
iter.cycle().skip_while(|id| *id != &current).nth(count)
}
Direction::Backward => {
let iter = editor.documents.keys();
// skip 'count' times past current buffer
iter.rev()
.cycle()
.skip_while(|id| *id != &current)
.nth(count)
}
}
.unwrap();
let index = match direction {
Direction::Forward => (index + count) % len,
// Equivalent to `(i - count).rem_euclid(len)` but avoids overflow.
Direction::Backward => (index + len - count % len) % len,
};
let id = *id;
let id = *editor.documents.get_index(index).unwrap().0;
// This could've probably been faster with an `editor.switch_by_index()` but
// the document indices are not integrated enough to implement that easily.
editor.switch(id, Action::Replace);
}
fn move_buffer_left(cx: &mut Context) {
let count = cx.count();
// Equivalent to `(i - count).rem_euclid(len)` but avoids overflow issues.
move_buffer(cx.editor, |i, len| (i + len - count % len) % len)
}
fn move_buffer_right(cx: &mut Context) {
@ -910,8 +901,7 @@ fn move_buffer_end(cx: &mut Context) {
#[inline]
fn move_buffer(editor: &mut Editor, index_transform: impl FnOnce(usize, usize) -> usize) {
let current = view!(editor).doc;
let index = editor.documents.get_index_of(&current).unwrap();
let index = editor.focused_document_index();
let new_index = index_transform(index, editor.documents.len());
editor.documents.move_index(index, new_index);
}

7
helix-view/src/editor.rs
View File

@ -1939,6 +1939,13 @@ pub fn documents_mut(&mut self) -> impl Iterator<Item = &mut Document> {
self.documents.values_mut()
}
#[inline]
pub fn focused_document_index(&self) -> usize {
self.documents
.get_index_of(&view!(self).doc)
.expect("focused document should always be present")
}
pub fn document_by_path<P: AsRef<Path>>(&self, path: P) -> Option<&Document> {
self.documents()
.find(|doc| doc.path().map(|p| p == path.as_ref()).unwrap_or(false))