From 8373919e6d72b37a35fa6adb12ca03eed6ee65d9 Mon Sep 17 00:00:00 2001
From: emilylime <emilyyyylime+git@gmail.com>
Date: Wed, 25 Sep 2024 19:51:59 +0300
Subject: [PATCH] Add `move_buffer_{left,right,start,end}` commands

---
 helix-term/src/commands.rs       | 32 ++++++++++++++++++++++++++++++--
 helix-term/src/keymap/default.rs |  4 ++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b1c29378d..f8603cd3e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -422,10 +422,14 @@ impl MappableCommand {
         goto_last_change, "Goto last change",
         goto_line_start, "Goto line start",
         goto_line_end, "Goto line end",
-        goto_next_buffer, "Goto next buffer",
-        goto_previous_buffer, "Goto previous buffer",
         goto_line_end_newline, "Goto newline at line end",
         goto_first_nonwhitespace, "Goto first non-blank in line",
+        goto_next_buffer, "Goto next buffer",
+        goto_previous_buffer, "Goto previous buffer",
+        move_buffer_left, "Move focused buffer to the left",
+        move_buffer_right, "Move focused buffer to the right",
+        move_buffer_start, "Move focused buffer to the start of the buffer list",
+        move_buffer_end, "Move focused buffer to the end of the buffer list",
         trim_selections, "Trim whitespace from selections",
         extend_to_line_start, "Extend to line start",
         extend_to_first_nonwhitespace, "Extend to first non-blank in line",
@@ -888,6 +892,30 @@ fn goto_buffer(editor: &mut Editor, direction: Direction, count: usize) {
     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) {
+    let count = cx.count();
+    move_buffer(cx.editor, |i, len| (i + count) % len)
+}
+fn move_buffer_start(cx: &mut Context) {
+    move_buffer(cx.editor, |_, _| 0)
+}
+fn move_buffer_end(cx: &mut Context) {
+    move_buffer(cx.editor, |_, len| len - 1)
+}
+
+#[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 new_index = index_transform(index, editor.documents.len());
+    editor.documents.move_index(index, new_index);
+}
+
 fn extend_to_line_start(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     goto_line_start_impl(view, doc, Movement::Extend)
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 5a3e8eed4..7d7ea7ef2 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -119,6 +119,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "e" => goto_prev_entry,
             "T" => goto_prev_test,
             "p" => goto_prev_paragraph,
+            "[" => move_buffer_left,
+            "{" => move_buffer_start,
             "space" => add_newline_above,
         },
         "]" => { "Right bracket"
@@ -133,6 +135,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
             "e" => goto_next_entry,
             "T" => goto_next_test,
             "p" => goto_next_paragraph,
+            "]" => move_buffer_right,
+            "}" => move_buffer_end,
             "space" => add_newline_below,
         },