From 3b7760dfb0cdb547ff8c94f7685554f59d16bf0a Mon Sep 17 00:00:00 2001 From: ath3 Date: Tue, 15 Nov 2022 15:14:18 +0100 Subject: Refactor blackhole register (#4504) --- helix-term/src/commands.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'helix-term/src/commands.rs') diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 5498a437..e5ca5611 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -1805,7 +1805,7 @@ fn search_selection(cx: &mut Context) { .join("|"); let msg = format!("register '{}' set to '{}'", '/', ®ex); - cx.editor.registers.get_mut('/').push(regex); + cx.editor.registers.push('/', regex); cx.editor.set_status(msg); } @@ -2121,16 +2121,14 @@ enum Operation { 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); if cx.register != Some('_') { // first yank the selection + let text = doc.text().slice(..); let values: Vec = 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); + cx.editor.registers.write(reg_name, values); }; // then delete @@ -5005,7 +5003,7 @@ fn record_macro(cx: &mut Context) { } }) .collect::(); - cx.editor.registers.get_mut(reg).write(vec![s]); + cx.editor.registers.write(reg, vec![s]); cx.editor .set_status(format!("Recorded to register [{}]", reg)); } else { -- cgit v1.2.3-70-g09d2