fix: clear selection when pressing Esc

nushell · Dec 31, 2024 · ff8a9da · ff8a9da
1 parent 31603ee
commit ff8a9da
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/src/core_editor/editor.rs b/src/core_editor/editor.rs
@@ -566,9 +566,15 @@ impl Editor {
         self.selection_anchor.map(|selection_anchor| {
             let buffer_len = self.line_buffer.len();
             if self.insertion_point() > selection_anchor {
-                (selection_anchor, (self.insertion_point() + 1).min(buffer_len))
+                (
+                    selection_anchor,
+                    (self.insertion_point() + 1).min(buffer_len),
+                )
             } else {
-                (self.insertion_point(), (selection_anchor + 1).min(buffer_len))
+                (
+                    self.insertion_point(),
+                    (selection_anchor + 1).min(buffer_len),
+                )
             }
         })
     }

diff --git a/src/edit_mode/vi/mod.rs b/src/edit_mode/vi/mod.rs
@@ -142,7 +142,16 @@ 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![
+                        // Move left then right to clear the selection.
+                        // Order matters here: this makes sure cursor does not move at end of line
+                        ReedlineEvent::Edit(vec![
+                            EditCommand::MoveLeft { select: false },
+                            EditCommand::MoveRight { select: false },
+                        ]),
+                        ReedlineEvent::Esc,
+                        ReedlineEvent::Repaint,
+                    ])
                 }
                 (_, KeyModifiers::NONE, KeyCode::Enter) => {
                     self.mode = ViMode::Insert;
@@ -191,7 +200,14 @@ mod test {
 
         assert_eq!(
             result,
-            ReedlineEvent::Multiple(vec![ReedlineEvent::Esc, ReedlineEvent::Repaint])
+            ReedlineEvent::Multiple(vec![
+                ReedlineEvent::Edit(vec![
+                    EditCommand::MoveLeft { select: false },
+                    EditCommand::MoveRight { select: false }
+                ]),
+                ReedlineEvent::Esc,
+                ReedlineEvent::Repaint
+            ])
         );
         assert!(matches!(vi.mode, ViMode::Normal));
     }