Merge pull request #646 from gwenn/caret_no_whitespace

Fix ViFirstPrint movement
kkawakam · Aug 20, 2022 · f1f20ac · f1f20ac
2 parents 5682cd3 + 9d42d75
commit f1f20ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/command.rs b/src/command.rs
@@ -51,7 +51,9 @@ pub fn execute<H: Helper>(
         }
         Cmd::Move(Movement::ViFirstPrint) => {
             s.edit_move_home()?;
-            s.edit_move_to_next_word(At::Start, Word::Big, 1)?;
+            if s.line.starts_with(char::is_whitespace) {
+                s.edit_move_to_next_word(At::Start, Word::Big, 1)?;
+            }
         }
         Cmd::Move(Movement::BackwardChar(n)) => {
             // Move back a character.

diff --git a/src/test/vi_cmd.rs b/src/test/vi_cmd.rs
@@ -58,6 +58,16 @@ fn caret() {
     );
 }
 
+#[test]
+fn caret_no_whitespace() {
+    assert_cursor(
+        EditMode::Vi,
+        ("Hi", ""),
+        &[E::ESC, E::from('^'), E::ENTER],
+        ("", "Hi"),
+    );
+}
+
 #[test]
 fn a() {
     assert_cursor(