Implement no-yank delete/change (#1099)

book/src/keymap.md

@@ -71,7 +71,9 @@
 | `<`         | Unindent selection                                               | `unindent`                |
 | `=`         | Format selection (**LSP**)                                       | `format_selections`       |
 | `d`         | Delete selection                                                 | `delete_selection`        |
+| `Alt-d`     | Delete selection, without yanking                                | `delete_selection_noyank` |
 | `c`         | Change selection (delete and enter insert mode)                  | `change_selection`        |
+| `Alt-c`     | Change selection (delete and enter insert mode, without yanking) | `change_selection_noyank` |
 | `Ctrl-a`    | Increment object (number) under cursor                           | `increment`               |
 | `Ctrl-x`    | Decrement object (number) under cursor                           | `decrement`               |
 
@@ -80,9 +82,9 @@
 | Key                     | Description                                                      | Command               |
 | ------                  | -----------                                                      | -------               |
 | <code>&#124;</code>     | Pipe each selection through shell command, replacing with output | `shell_pipe`          |
-| <code>A-&#124;</code> | Pipe each selection into shell command, ignoring output                          | `shell_pipe_to`       |
+| <code>Alt-&#124;</code> | Pipe each selection into shell command, ignoring output          | `shell_pipe_to`       |
 | `!`                     | Run shell command, inserting output before each selection        | `shell_insert_output` |
-| `A-!`                 | Run shell command, appending output after each selection                         | `shell_append_output` |
+| `Alt-!`                 | Run shell command, appending output after each selection         | `shell_append_output` |
 
 
 ### Selection manipulation

helix-term/src/commands.rs

@@ -9,7 +9,6 @@ use helix_core::{
     numbers::NumberIncrementor,
     object, pos_at_coords,
     regex::{self, Regex, RegexBuilder},
-    register::Register,
     search, selection, surround, textobject,
     unicode::width::UnicodeWidthChar,
     LineEnding, Position, Range, Rope, RopeGraphemes, RopeSlice, Selection, SmallVec, Tendril,
@@ -232,7 +231,9 @@ impl Command {
         extend_line, "Select current line, if already selected, extend to next line",
         extend_to_line_bounds, "Extend selection to line bounds (line-wise selection)",
         delete_selection, "Delete selection",
+        delete_selection_noyank, "Delete selection, without yanking",
         change_selection, "Change selection (delete and enter insert mode)",
+        change_selection_noyank, "Change selection (delete and enter insert mode, without yanking)",
         collapse_selection, "Collapse selection onto a single cursor",
         flip_selections, "Flip selection cursor and anchor",
         insert_mode, "Insert before selection",
@@ -1693,19 +1694,42 @@ fn extend_to_line_bounds(cx: &mut Context) {
     );
 }
 
-fn delete_selection_impl(reg: &mut Register, doc: &mut Document, view_id: ViewId) {
+enum Operation {
+    Delete,
+    Change,
+}
+
+fn delete_selection_impl(cx: &mut Context, op: Operation) {
+    let (view, doc) = current!(cx.editor);
+
     let text = doc.text().slice(..);
-    let selection = doc.selection(view_id);
+    let selection = doc.selection(view.id);
 
+    if cx.register != Some('_') {
         // first yank the selection
         let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
+        let reg_name = cx.register.unwrap_or('"');
+        let registers = &mut cx.editor.registers;
+        let reg = registers.get_mut(reg_name);
         reg.write(values);
+    };
 
     // then delete
     let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
         (range.from(), range.to(), None)
     });
-    doc.apply(&transaction, view_id);
+    doc.apply(&transaction, view.id);
+
+    match op {
+        Operation::Delete => {
+            doc.append_changes_to_history(view.id);
+            // exit select mode, if currently in select mode
+            exit_select_mode(cx);
+        }
+        Operation::Change => {
+            enter_insert_mode(doc);
+        }
+    }
 }
 
 #[inline]
@@ -1720,25 +1744,21 @@ fn delete_selection_insert_mode(doc: &mut Document, view: &View, selection: &Sel
 }
 
 fn delete_selection(cx: &mut Context) {
-    let reg_name = cx.register.unwrap_or('"');
+    delete_selection_impl(cx, Operation::Delete);
-    let (view, doc) = current!(cx.editor);
+}
-    let registers = &mut cx.editor.registers;
-    let reg = registers.get_mut(reg_name);
-    delete_selection_impl(reg, doc, view.id);
-
-    doc.append_changes_to_history(view.id);
 
-    // exit select mode, if currently in select mode
+fn delete_selection_noyank(cx: &mut Context) {
-    exit_select_mode(cx);
+    cx.register = Some('_');
+    delete_selection_impl(cx, Operation::Delete);
 }
 
 fn change_selection(cx: &mut Context) {
-    let reg_name = cx.register.unwrap_or('"');
+    delete_selection_impl(cx, Operation::Change);
-    let (view, doc) = current!(cx.editor);
+}
-    let registers = &mut cx.editor.registers;
+
-    let reg = registers.get_mut(reg_name);
+fn change_selection_noyank(cx: &mut Context) {
-    delete_selection_impl(reg, doc, view.id);
+    cx.register = Some('_');
-    enter_insert_mode(doc);
+    delete_selection_impl(cx, Operation::Change);
 }
 
 fn collapse_selection(cx: &mut Context) {

helix-term/src/keymap.rs

@@ -537,9 +537,9 @@ impl Default for Keymaps {
             "O" => open_above,
 
             "d" => delete_selection,
-            // TODO: also delete without yanking
+            "A-d" => delete_selection_noyank,
             "c" => change_selection,
-            // TODO: also change delete without yanking
+            "A-c" => change_selection_noyank,
 
             "C" => copy_selection_on_next_line,
             "A-C" => copy_selection_on_prev_line,