Fix jump behavior, goto_implementation now jump

Better jump behavior since we override the first jump if it's on the
first document. At the same time, ctrl-i is now working with gd jumps.
This commit is contained in:
Ivan Tham 2021-06-09 00:40:38 +08:00
parent 4dbc23ff1c
commit 6b3c9d8ed3
3 changed files with 20 additions and 10 deletions

View file

@ -1308,7 +1308,7 @@ pub fn normal_mode(cx: &mut Context) {
// Store a jump on the jumplist.
fn push_jump(editor: &mut Editor) {
let (view, doc) = editor.current();
let jump = { (doc.id(), doc.selection(view.id).clone()) };
let jump = (doc.id(), doc.selection(view.id).clone());
view.jumps.push(jump);
}
@ -2446,7 +2446,7 @@ pub fn jump_backward(cx: &mut Context) {
let count = cx.count();
let (view, doc) = cx.current();
if let Some((id, selection)) = view.jumps.backward(count) {
if let Some((id, selection)) = view.jumps.backward(view.id, doc, count) {
view.doc = *id;
let selection = selection.clone();
let (view, doc) = cx.current(); // refetch doc

View file

@ -280,7 +280,10 @@ pub fn default() -> Keymaps {
// z family for save/restore/combine from/to sels from register
ctrl!('i') => commands::jump_forward, // TODO: ctrl-i conflicts tab
KeyEvent { // supposedly ctrl!('i') but did not work
code: KeyCode::Tab,
modifiers: KeyModifiers::NONE,
} => commands::jump_forward,
ctrl!('o') => commands::jump_backward,
// ctrl!('s') => commands::save_selection,

View file

@ -37,17 +37,24 @@ impl JumpList {
pub fn forward(&mut self, count: usize) -> Option<&Jump> {
if self.current + count < self.jumps.len() {
self.current += count;
return self.jumps.get(self.current);
self.jumps.get(self.current)
} else {
None
}
None
}
pub fn backward(&mut self, count: usize) -> Option<&Jump> {
if self.current.checked_sub(count).is_some() {
self.current -= count;
return self.jumps.get(self.current);
// Taking view and doc to prevent unnecessary cloning when jump is not required.
pub fn backward(&mut self, view_id: ViewId, doc: &mut Document, count: usize) -> Option<&Jump> {
if let Some(current) = self.current.checked_sub(count) {
if self.current == self.jumps.len() {
let jump = (doc.id(), doc.selection(view_id).clone());
self.push(jump);
}
self.current = current;
self.jumps.get(self.current)
} else {
None
}
None
}
}