Esc should clear selection

nushell · Dec 31, 2024 · 202d51e · 202d51e
1 parent bd443f4
commit 202d51e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/edit_mode/vi/mod.rs b/src/edit_mode/vi/mod.rs
@@ -142,7 +142,11 @@ impl EditMode for Vi {
                 (_, KeyModifiers::NONE, KeyCode::Esc) => {
                     self.cache.clear();
                     self.mode = ViMode::Normal;
-                    ReedlineEvent::Multiple(vec![ReedlineEvent::Esc, ReedlineEvent::Repaint])
+                    ReedlineEvent::Multiple(vec![
+                        ReedlineEvent::Edit(vec![EditCommand::MoveRight { select: false }, EditCommand::MoveLeft { select: false }]),
+                        ReedlineEvent::Esc,
+                        ReedlineEvent::Repaint
+                    ])
                 }
                 (_, KeyModifiers::NONE, KeyCode::Enter) => {
                     self.mode = ViMode::Insert;
@@ -191,7 +195,11 @@ mod test {
 
         assert_eq!(
             result,
-            ReedlineEvent::Multiple(vec![ReedlineEvent::Esc, ReedlineEvent::Repaint])
+            ReedlineEvent::Multiple(vec![
+                ReedlineEvent::Edit(vec![EditCommand::MoveRight { select: false }, EditCommand::MoveLeft { select: false }]),
+                ReedlineEvent::Esc,
+                ReedlineEvent::Repaint
+            ])
         );
         assert!(matches!(vi.mode, ViMode::Normal));
     }