From 3f1640a9a087dd3010d19bbe7d9e3f2f73489769 Mon Sep 17 00:00:00 2001
From: Keith Simmons <keith@zed.dev>
Date: Tue, 10 May 2022 11:09:49 -0700
Subject: [PATCH] Fix up assertion errors in set_eq and visual tests

---
 crates/util/src/test/assertions.rs |  6 +++---
 crates/vim/src/visual.rs           | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/crates/util/src/test/assertions.rs b/crates/util/src/test/assertions.rs
index eccb5e41a678feffb4c0283796212fdce15b9aa5..c393104ae3f7ba8da5dcd1d2b3aded32a380eb7d 100644
--- a/crates/util/src/test/assertions.rs
+++ b/crates/util/src/test/assertions.rs
@@ -49,12 +49,12 @@ macro_rules! assert_set_eq {
         let left = $left;
         let right = $right;
 
-        match set_eq!(left, right) {
+        match set_eq!(&left, &right) {
             Err(SetEqError::LeftMissing(missing)) => {
-                panic!("assertion failed: `(left == right)`\n left: {:?}\nright: {:?}\nright does not contain {:?}", left, right, missing);
+                panic!("assertion failed: `(left == right)`\n left: {:?}\nright: {:?}\nright does not contain {:?}", &left, &right, &missing);
             },
             Err(SetEqError::RightMissing(missing)) => {
-                panic!("assertion failed: `(left == right)`\n left: {:?}\nright: {:?}\nleft does not contain {:?}", left, right, missing);
+                panic!("assertion failed: `(left == right)`\n left: {:?}\nright: {:?}\nleft does not contain {:?}", &left, &right, &missing);
             },
             _ => {}
         }
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index 3380fb823d9d6c16bef0fa34e0ad931b7e6bb6ad..9c41263317ef729a1e8c94cdf1426b1ab9c25c9b 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -56,6 +56,7 @@ pub fn change(_: &mut Workspace, _: &VisualChange, cx: &mut ViewContext<Workspac
 
 pub fn delete(_: &mut Workspace, _: &VisualDelete, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
+        vim.switch_mode(Mode::Normal, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.set_clip_at_line_ends(false, cx);
             editor.move_selections(cx, |map, selection| {
@@ -67,8 +68,15 @@ pub fn delete(_: &mut Workspace, _: &VisualDelete, cx: &mut ViewContext<Workspac
                 }
             });
             editor.insert("", cx);
+
+            // Fixup cursor position after the deletion
+            editor.set_clip_at_line_ends(true, cx);
+            editor.move_selections(cx, |map, selection| {
+                let mut cursor = selection.head();
+                cursor = map.clip_point(cursor, Bias::Left);
+                selection.collapse_to(cursor, selection.goal)
+            });
         });
-        vim.switch_mode(Mode::Normal, cx);
     });
 }
 
@@ -213,7 +221,7 @@ mod test {
     #[gpui::test]
     async fn test_visual_change(cx: &mut gpui::TestAppContext) {
         let cx = VimTestContext::new(cx, true).await;
-        let mut cx = cx.binding(["v", "w", "x"]).mode_after(Mode::Insert);
+        let mut cx = cx.binding(["v", "w", "c"]).mode_after(Mode::Insert);
         cx.assert("The quick |brown", "The quick |");
         let mut cx = cx.binding(["v", "w", "j", "c"]).mode_after(Mode::Insert);
         cx.assert(