From 7b65a6d687bbf4d12de020a7785082277804bbd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 4 Nov 2021 13:55:45 +0900
Subject: [PATCH] Rewrite goto_buffer

---
 helix-term/src/commands.rs | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index c1891baf..f16afdfe 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -530,22 +530,28 @@ 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
-            }
-        } 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);
+    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())
+        }
+        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) {