Skip to content

Commit

Permalink
Use an enum to represent yank decision during deletion of a selection (
Browse files Browse the repository at this point in the history
  • Loading branch information
voiceroy authored and Vulpesx committed Jun 7, 2024
1 parent bd5488d commit 45ddf8c
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions helix-term/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2617,24 +2617,29 @@ fn selection_is_linewise(selection: &Selection, text: &Rope) -> bool {
})
}

fn delete_selection_impl(cx: &mut Context, op: Operation, yank: bool) {
enum YankAction {
Yank,
NoYank,
}

fn delete_selection_impl(cx: &mut Context, op: Operation, yank: YankAction) {
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('_') && yank {
// first yank the selection
if cx.register != Some('_') && matches!(yank, YankAction::Yank) {
// yank the selection
let text = doc.text().slice(..);
let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
let reg_name = cx.register.unwrap_or('"');
if let Err(err) = cx.editor.registers.write(reg_name, values) {
cx.editor.set_error(err.to_string());
return;
}
};
}

// then delete
// delete the selection
let transaction =
Transaction::delete_by_selection(doc.text(), selection, |range| (range.from(), range.to()));
doc.apply(&transaction, view.id);
Expand Down Expand Up @@ -2700,19 +2705,19 @@ fn delete_by_selection_insert_mode(
}

fn delete_selection(cx: &mut Context) {
delete_selection_impl(cx, Operation::Delete, true);
delete_selection_impl(cx, Operation::Delete, YankAction::Yank);
}

fn delete_selection_noyank(cx: &mut Context) {
delete_selection_impl(cx, Operation::Delete, false);
delete_selection_impl(cx, Operation::Delete, YankAction::NoYank);
}

fn change_selection(cx: &mut Context) {
delete_selection_impl(cx, Operation::Change, true);
delete_selection_impl(cx, Operation::Change, YankAction::Yank);
}

fn change_selection_noyank(cx: &mut Context) {
delete_selection_impl(cx, Operation::Change, false);
delete_selection_impl(cx, Operation::Change, YankAction::NoYank);
}

fn collapse_selection(cx: &mut Context) {
Expand Down

0 comments on commit 45ddf8c

Please sign in to comment.