From 737282d0e9d33923dad682994a521ac46be3c0d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 3 Mar 2022 17:06:14 +0900
Subject: [PATCH] Extract a common function for paste_before/_after

---
 helix-term/src/commands.rs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4954c11a..936954c0 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4682,7 +4682,7 @@ fn replace_selections_with_primary_clipboard(cx: &mut Context) {
     let _ = replace_selections_with_clipboard_impl(cx.editor, ClipboardType::Selection, cx.count());
 }
 
-fn paste_after(cx: &mut Context) {
+fn paste(cx: &mut Context, pos: Paste) {
     let count = cx.count();
     let reg_name = cx.register.unwrap_or('"');
     let (view, doc) = current!(cx.editor);
@@ -4690,24 +4690,18 @@ fn paste_after(cx: &mut Context) {
 
     if let Some(transaction) = registers
         .read(reg_name)
-        .and_then(|values| paste_impl(values, doc, view, Paste::After, count))
+        .and_then(|values| paste_impl(values, doc, view, pos, count))
     {
         doc.apply(&transaction, view.id);
     }
 }
 
-fn paste_before(cx: &mut Context) {
-    let count = cx.count();
-    let reg_name = cx.register.unwrap_or('"');
-    let (view, doc) = current!(cx.editor);
-    let registers = &mut cx.editor.registers;
+fn paste_after(cx: &mut Context) {
+    paste(cx, Paste::After)
+}
 
-    if let Some(transaction) = registers
-        .read(reg_name)
-        .and_then(|values| paste_impl(values, doc, view, Paste::Before, count))
-    {
-        doc.apply(&transaction, view.id);
-    }
+fn paste_before(cx: &mut Context) {
+    paste(cx, Paste::Before)
 }
 
 fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {