1 files changed, 21 insertions, 2 deletions

diff --git a/lib/editorBuffer.ml b/lib/editorBuffer.ml
index 2e2b4b6..b682116 100644
--- a/lib/editorBuffer.ml
+++ b/lib/editorBuffer.ml
@@ -29,8 +29,27 @@ 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 delete_after ~n = Fn.apply_n_times ~n (map_focus pop_after) |> on_content
-  let delete_before ~n = Fn.apply_n_times ~n (map_focus pop) |> on_content
+
+  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
+    Fn.apply_n_times ~n aux |> on_content
+
+  let delete_before ?(cross_lines = false) ~n =
+    let aux z =
+      let line = focus_or ~default:Zipper.empty z in
+      if cross_lines && is_far_left line && not (is_far_left z) then
+        pop_after z |> left |> map_focus (far_right &> Fn.flip join line)
+      else map_focus pop z
+    in
+    Fn.apply_n_times ~n aux |> on_content
+
   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