kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use a boolean to indicate whether to yank during deletion of a selection (#10132)

Browse source
This commit is contained in:
Harishankar G 2024-04-03 23:10:55 +05:30 • committed by GitHub
parent 84cc42e5ee
commit f773972241
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
helix-term/src/commands.rs
View file

@ -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 (view, doc) = current!(cx.editor);
let selection = doc.selection(view.id); let selection = doc.selection(view.id);
let only_whole_lines = selection_is_linewise(selection, doc.text()); let only_whole_lines = selection_is_linewise(selection, doc.text());
if cx.register != Some('_') { if cx.register != Some('_') && yank {
// first yank the selection // first yank the selection
let text = doc.text().slice(..); let text = doc.text().slice(..);
let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect(); let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
@ -2700,21 +2700,19 @@ fn delete_by_selection_insert_mode(
} }
fn delete_selection(cx: &mut Context) { 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) { fn delete_selection_noyank(cx: &mut Context) {
cx.register = Some('_'); delete_selection_impl(cx, Operation::Delete, false);
delete_selection_impl(cx, Operation::Delete);
} }
fn change_selection(cx: &mut Context) { 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) { fn change_selection_noyank(cx: &mut Context) {
cx.register = Some('_'); delete_selection_impl(cx, Operation::Change, false);
delete_selection_impl(cx, Operation::Change);
} }
fn collapse_selection(cx: &mut Context) { fn collapse_selection(cx: &mut Context) {