From 848d2651875a79e8e3fb4406c36266a9e288b259 Mon Sep 17 00:00:00 2001 From: Harishankar G Date: Wed, 3 Apr 2024 20:02:50 +0530 Subject: [PATCH] Use a boolean to indicate whether to yank during deletion of a selection --- helix-term/src/commands.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index e7a75eb1adb9..b3614793ff18 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -2617,13 +2617,13 @@ fn selection_is_linewise(selection: &Selection, text: &Rope) -> bool { }) } -fn delete_selection_impl(cx: &mut Context, op: Operation) { +fn delete_selection_impl(cx: &mut Context, op: Operation, yank: bool) { let (view, doc) = current!(cx.editor); let selection = doc.selection(view.id); let only_whole_lines = selection_is_linewise(selection, doc.text()); - if cx.register != Some('_') { + if cx.register != Some('_') && yank { // first yank the selection let text = doc.text().slice(..); let values: Vec = selection.fragments(text).map(Cow::into_owned).collect(); @@ -2700,21 +2700,19 @@ fn delete_by_selection_insert_mode( } fn delete_selection(cx: &mut Context) { - delete_selection_impl(cx, Operation::Delete); + delete_selection_impl(cx, Operation::Delete, true); } fn delete_selection_noyank(cx: &mut Context) { - cx.register = Some('_'); - delete_selection_impl(cx, Operation::Delete); + delete_selection_impl(cx, Operation::Delete, false); } fn change_selection(cx: &mut Context) { - delete_selection_impl(cx, Operation::Change); + delete_selection_impl(cx, Operation::Change, true); } fn change_selection_noyank(cx: &mut Context) { - cx.register = Some('_'); - delete_selection_impl(cx, Operation::Change); + delete_selection_impl(cx, Operation::Change, false); } fn collapse_selection(cx: &mut Context) {