feat: add ability to paste text from a register

Register are simplier than Vim register, in particular no register is
local to buffers.

1 files changed, 40 insertions, 58 deletions

diff --git a/lib/editor.ml b/lib/editor.ml
index f8091b8..0ed2229 100644
--- a/lib/editor.ml
+++ b/lib/editor.ml
@@ -3,6 +3,12 @@ module Buffer = EditorBuffer
 open Util
 
 type mode = Normal | Insert | Control
+
+type selection =
+  | Empty
+  | Glyphwise of char Sequence.t Sequence.t
+  | Linewise of char Sequence.t Sequence.t
+
 type cursor = int * int
 
 type editor = {
@@ -19,6 +25,7 @@ type editor = {
   message_timestamp : float;
   message_duration : float;
   pending_command : string;
+  registers : selection Array.t;
 }
 
 type t = editor
@@ -38,6 +45,7 @@ let init (c : Config.t) : editor =
     message_timestamp = Unix.time ();
     message_duration = 5.;
     pending_command = "";
+    registers = Array.create ~len:128 Empty;
   }
 
 let string_of_mode = function
@@ -142,6 +150,16 @@ module Action = struct
   let set_focused_buffer b e = ((), { e with buffer = Some b })
   let get_terminal_size e = (e.term.size, e)
 
+  let get_register r e =
+    assert (Char.('!' <= r && r <= '~'));
+    (e.registers.(Char.to_int r), e)
+
+  let set_register r z e =
+    assert (Char.('!' <= r && r <= '~'));
+    e.registers.(Char.to_int '"') <- z;
+    e.registers.(Char.to_int r) <- z;
+    ((), e)
+
   let on_focused_buffer f =
     let f e = { e with buffer = Option.map ~f e.buffer } in
     modify ~f *> update_cursor
@@ -218,64 +236,6 @@ let move ?(up = 0) ?(down = 0) ?(left = 0) ?(right = 0) (x, y) =
 
 let move_to ?x ?y (sx, sy) = Option.(value x ~default:sx, value y ~default:sy)
 
-(* let get_next_command s = *)
-(*   match Sequence.next s.pending with *)
-(*   | None -> (None, s) *)
-(*   | Some (h, t) -> (Some h, { s with pending = t }) *)
-
-(* let handle_insert_key = *)
-(*   let open Action in *)
-(*   let open Key in *)
-(*   function *)
-(*   | Arrow_down -> Buffer.Action.down |> on_focused_buffer *)
-(*   | Arrow_left -> Buffer.Action.left |> on_focused_buffer *)
-(*   | Arrow_right -> Buffer.Action.right |> on_focused_buffer *)
-(*   | Arrow_up -> Buffer.Action.up |> on_focused_buffer *)
-(*   | Backspace -> Buffer.Action.delete_before |> on_focused_buffer *)
-(*   | Ctrl 'Q' -> quit 0 *)
-(*   | Delete -> Buffer.Action.delete_after |> on_focused_buffer *)
-(*   | Enter -> Buffer.Action.newline |> on_focused_buffer *)
-(*   | Esc -> (Buffer.Action.left |> on_focused_buffer) *> set_mode Normal *)
-(*   | Key k -> Buffer.Action.insert k |> on_focused_buffer *)
-(*   | _ -> noop *)
-
-(* let handle_normal_key = *)
-(*   let open Action in *)
-(*   let open Key in *)
-(*   function *)
-(*   | Arrow_down | Key 'j' -> Buffer.Action.down |> on_focused_buffer *)
-(*   | Arrow_left | Backspace | Key 'h' -> Buffer.Action.left |> on_focused_buffer *)
-(*   | Arrow_right | Key ' ' | Key 'l' -> Buffer.Action.right |> on_focused_buffer *)
-(*   | Arrow_up | Key 'k' -> Buffer.Action.up |> on_focused_buffer *)
-(*   | Ctrl 'Q' -> quit 0 *)
-(*   | Key '0' -> Buffer.Action.bol |> on_focused_buffer_or_new *)
-(*   | Key 'A' -> *)
-(*       (Buffer.Action.eol |> on_focused_buffer_or_new) *> set_mode Insert *)
-(*   | Key 'a' -> *)
-(*       (Buffer.Action.right |> on_focused_buffer_or_new) *> set_mode Insert *)
-(*   | Key 'G' -> Buffer.Action.eof |> on_focused_buffer_or_new *)
-(*   | Key 'I' -> *)
-(*       noop *)
-(*       (1* (Buffer.Action.bol |> on_focused_buffer_or_new) *> set_mode Insert *1) *)
-(*   | Key 'i' -> (Fn.id |> on_focused_buffer_or_new) *> set_mode Insert *)
-(*   | Key 's' -> *)
-(*       (Buffer.Action.delete_after |> on_focused_buffer_or_new) *)
-(*       *> set_mode Insert *)
-(*   | Key 'x' -> Buffer.Action.delete_after |> on_focused_buffer_or_new *)
-(*   | Key 'X' -> Buffer.Action.delete_before |> on_focused_buffer_or_new *)
-(*   | Key '$' -> Buffer.Action.eol |> on_focused_buffer_or_new *)
-(*   | _ -> noop *)
-
-(* let handle_next_command = *)
-(*   let f m = function *)
-(*     | None -> Action.return () *)
-(*     | Some k -> ( *)
-(*         match m with *)
-(*         | Insert -> handle_insert_key k *)
-(*         | Normal -> handle_normal_key k) *)
-(*   in *)
-(*   Action.(map2 ~f get_mode get_next_command |> join) *)
-
 let handle_insert_command =
   let open Command in
   let open Action in
@@ -434,6 +394,28 @@ let handle_normal_command c =
         Buffer.Action.(
           delete_to_eol &> move_down &> delete_lines ~n &> move_up &> eol)
         |> on_focused_buffer_or_new
+    (* Paste *)
+    | Shortcut (r, n, Paste_after) ->
+        let r = Option.value ~default:'"' r in
+        let paste = function
+          | Empty -> noop
+          | Glyphwise z -> Buffer.Action.paste ?n z |> on_focused_buffer_or_new
+          | Linewise z ->
+              Buffer.Action.paste ~linewise:true ?n z
+              |> on_focused_buffer_or_new
+        in
+        get_register r >>= paste
+    | Shortcut (r, n, Paste_before) ->
+        let r = Option.value ~default:'"' r in
+        let paste = function
+          | Empty -> noop
+          | Glyphwise z ->
+              Buffer.Action.paste ~before:true ?n z |> on_focused_buffer_or_new
+          | Linewise z ->
+              Buffer.Action.paste ~before:true ~linewise:true ?n z
+              |> on_focused_buffer_or_new
+        in
+        get_register r >>= paste
     (* Join *)
     | Shortcut (_, n, Join) ->
         let n = Option.(value ~default:1 n) in