From dde2be93956f82622c85171bd03dab1b6864318c Mon Sep 17 00:00:00 2001
From: Nathan Vegdahl <cessen@cessen.com>
Date: Tue, 10 Aug 2021 17:17:59 -0700
Subject: [PATCH] Fix surround_replace replacing the wrong character on the
 right. (#571)

Fixes #569.
---
 helix-term/src/commands.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b918256e..e15332c8 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4017,11 +4017,11 @@ fn surround_replace(cx: &mut Context) {
                     let transaction = Transaction::change(
                         doc.text(),
                         change_pos.iter().enumerate().map(|(i, &pos)| {
-                            if i % 2 == 0 {
-                                (pos, pos + 1, Some(Tendril::from_char(open)))
-                            } else {
-                                (pos.saturating_sub(1), pos, Some(Tendril::from_char(close)))
-                            }
+                            (
+                                pos,
+                                pos + 1,
+                                Some(Tendril::from_char(if i % 2 == 0 { open } else { close })),
+                            )
                         }),
                     );
                     doc.apply(&transaction, view.id);