Defedit text editor remove line

editor/src/clj/editor/code/data.clj

@@ -2063,7 +2063,24 @@
  to (cursor-next-word lines from)]
  [(->CursorRange from to) [""]]))
 
-(defn- delete-range [lines cursor-range]
+(defn delete-to-beginning-of-line [lines cursor-range]
+ (let [from (CursorRange->Cursor cursor-range)
+ to (cursor-line-start lines from)]
+ [(->CursorRange from to) [""]]))
+
+(defn delete-line [lines cursor-range]
+ (let [cursor-rows (first (cursor-ranges->row-runs lines [cursor-range]))
+ row-start (get cursor-rows 0)
+ row-end (get cursor-rows 1)
+ row-ranges-to-delete (mapv (fn [row]
+ (let [from (->Cursor row 0)
+ to (cursor-line-end lines from)]
+ [(->CursorRange from to) [""]]))
+ (range row-start row-end))]
+ ;; TODO-JG: I don't know exactly what to do with these..
+ (first row-ranges-to-delete)))
+
+(defn delete-range [lines cursor-range]
  [(adjust-cursor-range lines cursor-range) [""]])
 
 (defn- put-selection-on-clipboard! [lines cursor-ranges clipboard]
@@ -2527,9 +2544,7 @@
  (can-paste-multi-selection? clipboard cursor-ranges)))
 
 (defn delete [lines cursor-ranges regions ^LayoutInfo layout delete-fn]
- (-> (if (every? cursor-range-empty? cursor-ranges)
- (splice lines regions (map (partial delete-fn lines) cursor-ranges))
- (splice lines regions (map (partial delete-range lines) cursor-ranges)))
+ (-> (splice lines regions (map (partial delete-fn lines) cursor-ranges))
  (frame-cursor layout)))
 
 (defn- apply-move [lines cursor-ranges ^LayoutInfo layout move-fn cursor-fn]

editor/src/clj/editor/code/view.clj

@@ -1329,11 +1329,30 @@
  cursor-ranges-empty? (every? data/cursor-range-empty? cursor-ranges)
  single-character-backspace? (and cursor-ranges-empty? (= :delete-before delete-type))
  undo-grouping (when cursor-ranges-empty? :typing)
+
  delete-fn (case delete-type
- :delete-before data/delete-character-before-cursor
- :delete-word-before data/delete-word-before-cursor
- :delete-after data/delete-character-after-cursor
- :delete-word-after data/delete-word-after-cursor)]
+ :delete-before
+ (if cursor-ranges-empty?
+ data/delete-character-before-cursor
+ data/delete-range)
+
+ :delete-word-before
+ (if cursor-ranges-empty?
+ data/delete-word-before-cursor
+ data/delete-range)
+
+ :delete-after
+ (if cursor-ranges-empty?
+ data/delete-character-after-cursor
+ data/delete-range)
+
+ :delete-word-after
+ (if cursor-ranges-empty?
+ data/delete-word-after-cursor
+ data/delete-range)
+
+ :delete-to-beginning-of-line data/delete-to-beginning-of-line
+ :delete-line data/delete-line)]
  (when-not single-character-backspace?
  (hide-suggestions! view-node))
  (set-properties! view-node undo-grouping
@@ -1730,6 +1749,12 @@
 (handler/defhandler :delete-next-word :code-view
  (run [view-node] (delete! view-node :delete-word-after)))
 
+(handler/defhandler :delete-to-beginning-of-line :code-view
+ (run [view-node] (delete! view-node :delete-to-beginning-of-line)))
+
+(handler/defhandler :delete-line :code-view
+ (run [view-node] (delete! view-node :delete-line)))
+
 (handler/defhandler :select-next-occurrence :code-view
  (run [view-node] (select-next-occurrence! view-node)))
 

editor/src/clj/editor/keymap.clj

@@ -74,6 +74,7 @@
  ["Meta+'-'" :zoom-out]
  ["Meta+A" :select-all]
  ["Meta+B" :build]
+ ["Meta+Backspace" :delete-to-beginning-of-line]
  ["Meta+C" :copy]
  ["Meta+Comma" :preferences]
  ["Meta+D" :select-next-occurrence]