From 843ae971209d41b88b66d282979ed76303ec5e34 Mon Sep 17 00:00:00 2001
From: Alex Vinyals <alevinval@gmail.com>
Date: Thu, 13 Jul 2023 15:01:44 +0200
Subject: [PATCH] enhanced `surround_replace` to provide visual feedback
 (#7588)

---
 helix-term/src/commands.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 42ce57774..58c172968 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5174,11 +5174,18 @@ fn surround_replace(cx: &mut Context) {
             }
         };
 
+        let selection = selection.clone();
+        let ranges: SmallVec<[Range; 1]> = change_pos.iter().map(|&p| Range::point(p)).collect();
+        doc.set_selection(
+            view.id,
+            Selection::new(ranges, selection.primary_index() * 2),
+        );
+
         cx.on_next_key(move |cx, event| {
             let (view, doc) = current!(cx.editor);
             let to = match event.char() {
                 Some(to) => to,
-                None => return,
+                None => return doc.set_selection(view.id, selection),
             };
             let (open, close) = surround::get_pair(to);
             let transaction = Transaction::change(
@@ -5189,6 +5196,7 @@ fn surround_replace(cx: &mut Context) {
                     (pos, pos + 1, Some(t))
                 }),
             );
+            doc.set_selection(view.id, selection);
             doc.apply(&transaction, view.id);
             exit_select_mode(cx);
         });