1 files changed, 9 insertions, 3 deletions
diff --git a/src/edit.zig b/src/edit.zig
index 3cbbc28c..56d537bf 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -1512,16 +1512,22 @@ pub fn surroundAdd(p: *Pardes, t: *Text, ch: u21) void {
     t.select = false;
     const eb = editTextEol(p, t, selRows(t)) orelse return;
     const r = selRange(t, eb.text, eb.row0);
+    // the wrapped range keeps the direction it had (helix with_direction)
+    const back = t.vsel.active and (t.cur_row < t.vsel.row or (t.cur_row == t.vsel.row and t.cur_col < t.vsel.col));
     pushUndo(p, t);
     const close_col = modal.nextGrapheme(modal.lineSlice(eb.text, r.b.row), r.b.col);
     var new = modal.insertAt(p.gpa, eb.text, .{ .row = r.b.row, .col = close_col }, &[1]u8{pr.c}) catch return;
     setEditText(p, t, new);
     new = modal.insertAt(p.gpa, new, .{ .row = r.a.row, .col = r.a.col }, &[1]u8{pr.o}) catch return;
     setEditText(p, t, new);
+    const open_row = @as(i32, @intCast(r.a.row)) + eb.row0;
+    const open_col: i32 = @intCast(r.a.col);
+    const close_row = @as(i32, @intCast(r.b.row)) + eb.row0;
+    const close_at: i32 = @intCast(close_col + @as(usize, if (r.a.row == r.b.row) 1 else 0));
     t.msel.active = false;
-    t.vsel = .{ .active = true, .row = @as(i32, @intCast(r.a.row)) + eb.row0, .col = @intCast(r.a.col), .explicit = false };
-    t.cur_row = @as(i32, @intCast(r.b.row)) + eb.row0;
-    t.cur_col = @intCast(close_col + @as(usize, if (r.a.row == r.b.row) 1 else 0));
+    t.vsel = .{ .active = true, .row = if (back) close_row else open_row, .col = if (back) close_at else open_col, .explicit = false };
+    t.cur_row = if (back) open_row else close_row;
+    t.cur_col = if (back) open_col else close_at;
     t.cur_pinned = true;
     t.sticky_col = -1;
     t.show();