Decrement self.current while popping from front

helix-view/src/view.rs

@@ -39,21 +39,19 @@ impl JumpList {
     }
 
     // Returns the number of elements removed from the start
-    pub fn push(&mut self, jump: Jump) -> usize {
-        let mut num_removed = 0;
+    pub fn push(&mut self, jump: Jump) {
         // don't push duplicates
         if self.jumps.back() != Some(&jump) {
             // If the jumplist is full, drop the oldest items until we have space for another addition.
             for _ in 0..((self.jumps.len() + 1).saturating_sub(JUMP_LIST_CAPACITY)) {
                 if self.jumps.pop_front().is_some() {
-                    num_removed += 1;
+                    self.current = self.current.saturating_sub(1);
                 }
             }
 
             self.jumps.push_back(jump);
         }
         self.current = self.jumps.len();
-        num_removed
     }
 
     pub fn forward(&mut self, count: usize) -> Option<&Jump> {
@@ -67,13 +65,12 @@ 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(mut current) = self.current.checked_sub(count) {
+        if let Some(current) = self.current.checked_sub(count) {
+            self.current = current;
             let cur_jump = (doc.id(), doc.selection(view_id).clone());
             if self.current == self.jumps.len() {
-                let num_removed = self.push(cur_jump.clone());
-                current = current.saturating_sub(num_removed);
+                self.push(cur_jump.clone());
             }
-            self.current = current;
             self.jumps.get(self.current).and_then(|next_jump| {
                 if next_jump == &cur_jump {
                     self.current -= 1;