Unnamed repository; edit this file 'description' to name the repository.
Fix jump_backwards behaviour when jumplist is at capacity (#10968)
* Fix jump_backwards behaviour when jumplist is at capacity
* Decrement self.current while popping from front
* Fix issue with conflicting updates to self.current
* Realised that truncate is intentional
* Use saturating_sub when decrementing current
* Fix naming of previous jump, and remove unneeded comment change
* Remove unnecessary changes in push
* Return num elements removed from front, and use in backward method
* Hide num_removed from public interface and tidy up jump location check
| -rw-r--r-- | helix-view/src/view.rs | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs index 5b283b98..4c067494 100644 --- a/helix-view/src/view.rs +++ b/helix-view/src/view.rs @@ -38,18 +38,25 @@ impl JumpList { Self { jumps, current: 0 } } - pub fn push(&mut self, jump: Jump) { + fn push_impl(&mut self, jump: Jump) -> usize { + let mut num_removed_from_front = 0; self.jumps.truncate(self.current); // don't push duplicates if self.jumps.back() != Some(&jump) { // If the jumplist is full, drop the oldest item. while self.jumps.len() >= JUMP_LIST_CAPACITY { self.jumps.pop_front(); + num_removed_from_front += 1; } self.jumps.push_back(jump); self.current = self.jumps.len(); } + num_removed_from_front + } + + pub fn push(&mut self, jump: Jump) { + self.push_impl(jump); } pub fn forward(&mut self, count: usize) -> Option<&Jump> { @@ -63,13 +70,22 @@ impl JumpList { // 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 let Some(mut current) = self.current.checked_sub(count) { if self.current == self.jumps.len() { let jump = (doc.id(), doc.selection(view_id).clone()); - self.push(jump); + let num_removed = self.push_impl(jump); + current = current.saturating_sub(num_removed); } self.current = current; - self.jumps.get(self.current) + + // Avoid jumping to the current location. + let jump @ (doc_id, selection) = self.jumps.get(self.current)?; + if doc.id() == *doc_id && doc.selection(view_id) == selection { + self.current = self.current.checked_sub(1)?; + self.jumps.get(self.current) + } else { + Some(jump) + } } else { None } |