2 files changed, 15 insertions, 11 deletions

diff --git a/lib/editor.ml b/lib/editor.ml
index 959b3af..9078a09 100644
--- a/lib/editor.ml
+++ b/lib/editor.ml
@@ -186,15 +186,16 @@ let handle_insert_command =
   let open Command in
   let open Action in
   function
-  | Simple Arrow_down -> Buffer.Action.down |> on_focused_buffer
-  | Simple Arrow_left -> Buffer.Action.left |> on_focused_buffer
-  | Simple Arrow_right -> Buffer.Action.right |> on_focused_buffer
-  | Simple Arrow_up -> Buffer.Action.up |> on_focused_buffer
   | Simple Backspace -> Buffer.Action.delete_before ~n:1 |> on_focused_buffer
+  | Simple Arrow_down -> Buffer.Action.move_down |> on_focused_buffer
+  | Simple Arrow_left -> Buffer.Action.move_left |> on_focused_buffer
+  | Simple Arrow_right -> Buffer.Action.move_right |> on_focused_buffer
+  | Simple Arrow_up -> Buffer.Action.move_up |> on_focused_buffer
   | Simple (Ctrl 'Q') -> quit 0
   | Simple Delete -> Buffer.Action.delete_after ~n:1 |> on_focused_buffer
   | Simple Enter -> Buffer.Action.newline |> on_focused_buffer
-  | Simple Esc -> (Buffer.Action.left |> on_focused_buffer) *> set_mode Normal
+  | Simple Esc ->
+      (Buffer.Action.move_left |> on_focused_buffer) *> set_mode Normal
   | Type k -> Buffer.Action.insert k |> on_focused_buffer
   | _ -> noop
 
@@ -203,16 +204,19 @@ let handle_normal_command =
   let open Action in
   function
   (* Movements *)
-  | Chord (_, n, Noop, _, Down) -> Buffer.Action.down ?n |> on_focused_buffer
-  | Chord (_, n, Noop, _, Left) -> Buffer.Action.left ?n |> on_focused_buffer
-  | Chord (_, n, Noop, _, Right) -> Buffer.Action.right ?n |> on_focused_buffer
-  | Chord (_, n, Noop, _, Up) -> Buffer.Action.up ?n |> on_focused_buffer
+  | Chord (_, n, Noop, _, Down) ->
+      Buffer.Action.move_down ?n |> on_focused_buffer
+  | Chord (_, n, Noop, _, Left) ->
+      Buffer.Action.move_left ?n |> on_focused_buffer
+  | Chord (_, n, Noop, _, Right) ->
+      Buffer.Action.move_right ?n |> on_focused_buffer
+  | Chord (_, n, Noop, _, Up) -> Buffer.Action.move_up ?n |> on_focused_buffer
   | Simple (Ctrl 'Q') -> quit 0
   (* | Key '0' -> Buffer.Action.bol |> on_focused_buffer_or_new *)
   | Simple (Key 'A') ->
       (Buffer.Action.eol |> on_focused_buffer_or_new) *> set_mode Insert
   | Simple (Key 'a') ->
-      (Buffer.Action.right |> on_focused_buffer_or_new) *> set_mode Insert
+      (Buffer.Action.move_right |> on_focused_buffer_or_new) *> set_mode Insert
   (* | Key 'G' -> Buffer.Action.eof |> on_focused_buffer_or_new *)
   (* | Key 'I' -> noop *)
   | Simple (Key 'i') -> (Fn.id |> on_focused_buffer_or_new) *> set_mode Insert
diff --git a/lib/editorBuffer.ml b/lib/editorBuffer.ml
index 715855c..2e2b4b6 100644
--- a/lib/editorBuffer.ml
+++ b/lib/editorBuffer.ml
@@ -14,7 +14,7 @@ let empty =
 module Action = struct
   let on_content f b = { b with content = Result.map ~f b.content }
 
-  let up, down, left, right =
+  let move_up, move_down, move_left, move_right =
     let vertical f ?(n = 1) =
       on_content (fun z ->
           let col = focus_or ~default:Zipper.empty z |> left_length in