feat: add support for "instant" normal commands (like [J]oin)

1 files changed, 11 insertions, 5 deletions

diff --git a/lib/editorBuffer.ml b/lib/editorBuffer.ml
index b682116..ea89fb9 100644
--- a/lib/editorBuffer.ml
+++ b/lib/editorBuffer.ml
@@ -29,13 +29,12 @@ module Action = struct
   let bof = far_left |> on_content
   let eof = far_right |> on_content
   let insert k = map_focus (push k) |> on_content
+  (* let replace k = () *)
 
   let delete_after ?(cross_lines = false) ~n =
     let aux z =
       let line = focus_or ~default:Zipper.empty z in
       if cross_lines && is_far_right line && not (is_far_right z) then
-        (* let next = right z |> focus_or ~default:Zipper.empty |> far_left in *)
-        (* right z |> pop_after |> left |> map_focus (Fn.flip join next) *)
         pop_after z |> map_focus_or ~default:line (far_left &> join line)
       else map_focus pop_after z
     in
@@ -53,9 +52,7 @@ module Action = struct
   let delete_to_eol = map_focus (split &> fst) |> on_content
   let delete_to_bol = map_focus (split &> snd) |> on_content
   let delete_lines ~n = Fn.apply_n_times ~n pop_after |> on_content
-
-  let delete_lines_before ~n =
-    on_content (fun z -> pop_after z |> Fn.apply_n_times ~n:(n - 1) pop_before)
+  let delete_lines_before ~n = Fn.apply_n_times ~n pop_before |> on_content
 
   let newline =
     let aux z =
@@ -64,6 +61,15 @@ module Action = struct
     in
     on_content aux
 
+  let join_lines ~n =
+    let aux z =
+      if is_far_right z || is_far_right (right z) then z
+      else
+        let line = focus_or ~default:Zipper.empty z |> far_right in
+        pop_after z |> map_focus (far_left &> join line)
+    in
+    Fn.apply_n_times ~n aux |> on_content
+
   (* let save_history_to ?(clear = true) r = () *)
 end