2022-04-21 23:14:58 +00:00
|
|
|
mod change;
|
|
|
|
mod delete;
|
|
|
|
|
2022-04-22 16:43:15 +00:00
|
|
|
use crate::{
|
|
|
|
motion::Motion,
|
|
|
|
state::{Mode, Operator},
|
|
|
|
Vim,
|
|
|
|
};
|
2022-04-21 23:14:58 +00:00
|
|
|
use change::init as change_init;
|
2022-04-29 23:14:01 +00:00
|
|
|
use collections::HashSet;
|
|
|
|
use editor::{Bias, DisplayPoint};
|
2022-04-22 16:43:15 +00:00
|
|
|
use gpui::{actions, MutableAppContext, ViewContext};
|
|
|
|
use language::SelectionGoal;
|
|
|
|
use workspace::Workspace;
|
2022-04-21 23:14:58 +00:00
|
|
|
|
|
|
|
use self::{change::change_over, delete::delete_over};
|
|
|
|
|
2022-04-22 16:43:15 +00:00
|
|
|
actions!(
|
|
|
|
vim,
|
|
|
|
[
|
|
|
|
InsertAfter,
|
|
|
|
InsertFirstNonWhitespace,
|
|
|
|
InsertEndOfLine,
|
|
|
|
InsertLineAbove,
|
|
|
|
InsertLineBelow,
|
|
|
|
DeleteLeft,
|
|
|
|
DeleteRight,
|
|
|
|
ChangeToEndOfLine,
|
|
|
|
DeleteToEndOfLine,
|
|
|
|
]
|
|
|
|
);
|
2022-04-21 23:14:58 +00:00
|
|
|
|
|
|
|
pub fn init(cx: &mut MutableAppContext) {
|
2022-04-22 16:43:15 +00:00
|
|
|
cx.add_action(insert_after);
|
|
|
|
cx.add_action(insert_first_non_whitespace);
|
|
|
|
cx.add_action(insert_end_of_line);
|
|
|
|
cx.add_action(insert_line_above);
|
|
|
|
cx.add_action(insert_line_below);
|
|
|
|
cx.add_action(|_: &mut Workspace, _: &DeleteLeft, cx| {
|
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
delete_over(vim, Motion::Left, cx);
|
|
|
|
})
|
|
|
|
});
|
|
|
|
cx.add_action(|_: &mut Workspace, _: &DeleteRight, cx| {
|
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
delete_over(vim, Motion::Right, cx);
|
|
|
|
})
|
|
|
|
});
|
|
|
|
cx.add_action(|_: &mut Workspace, _: &ChangeToEndOfLine, cx| {
|
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
change_over(vim, Motion::EndOfLine, cx);
|
|
|
|
})
|
|
|
|
});
|
|
|
|
cx.add_action(|_: &mut Workspace, _: &DeleteToEndOfLine, cx| {
|
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
delete_over(vim, Motion::EndOfLine, cx);
|
|
|
|
})
|
|
|
|
});
|
|
|
|
|
2022-04-21 23:14:58 +00:00
|
|
|
change_init(cx);
|
|
|
|
}
|
2022-03-28 00:58:28 +00:00
|
|
|
|
2022-04-15 23:00:44 +00:00
|
|
|
pub fn normal_motion(motion: Motion, cx: &mut MutableAppContext) {
|
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
match vim.state.operator_stack.pop() {
|
|
|
|
None => move_cursor(vim, motion, cx),
|
|
|
|
Some(Operator::Change) => change_over(vim, motion, cx),
|
|
|
|
Some(Operator::Delete) => delete_over(vim, motion, cx),
|
2022-04-19 18:36:44 +00:00
|
|
|
Some(Operator::Namespace(_)) => {
|
|
|
|
// Can't do anything for a namespace operator. Ignoring
|
|
|
|
}
|
2022-04-15 23:00:44 +00:00
|
|
|
}
|
|
|
|
vim.clear_operator(cx);
|
2022-03-28 00:58:28 +00:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2022-04-15 23:00:44 +00:00
|
|
|
fn move_cursor(vim: &mut Vim, motion: Motion, cx: &mut MutableAppContext) {
|
|
|
|
vim.update_active_editor(cx, |editor, cx| {
|
2022-04-21 23:14:58 +00:00
|
|
|
editor.move_cursors(cx, |map, cursor, goal| motion.move_point(map, cursor, goal))
|
2022-03-28 00:58:28 +00:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2022-04-22 16:43:15 +00:00
|
|
|
fn insert_after(_: &mut Workspace, _: &InsertAfter, cx: &mut ViewContext<Workspace>) {
|
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
vim.switch_mode(Mode::Insert, cx);
|
|
|
|
vim.update_active_editor(cx, |editor, cx| {
|
|
|
|
editor.move_cursors(cx, |map, cursor, goal| {
|
|
|
|
Motion::Right.move_point(map, cursor, goal)
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
fn insert_first_non_whitespace(
|
|
|
|
_: &mut Workspace,
|
|
|
|
_: &InsertFirstNonWhitespace,
|
|
|
|
cx: &mut ViewContext<Workspace>,
|
|
|
|
) {
|
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
vim.switch_mode(Mode::Insert, cx);
|
|
|
|
vim.update_active_editor(cx, |editor, cx| {
|
|
|
|
editor.move_cursors(cx, |map, cursor, goal| {
|
|
|
|
Motion::FirstNonWhitespace.move_point(map, cursor, goal)
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
fn insert_end_of_line(_: &mut Workspace, _: &InsertEndOfLine, cx: &mut ViewContext<Workspace>) {
|
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
vim.switch_mode(Mode::Insert, cx);
|
|
|
|
vim.update_active_editor(cx, |editor, cx| {
|
|
|
|
editor.move_cursors(cx, |map, cursor, goal| {
|
|
|
|
Motion::EndOfLine.move_point(map, cursor, goal)
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
fn insert_line_above(_: &mut Workspace, _: &InsertLineAbove, cx: &mut ViewContext<Workspace>) {
|
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
vim.switch_mode(Mode::Insert, cx);
|
|
|
|
vim.update_active_editor(cx, |editor, cx| {
|
|
|
|
editor.transact(cx, |editor, cx| {
|
2022-04-29 23:14:01 +00:00
|
|
|
let (map, old_selections) = editor.display_selections(cx);
|
|
|
|
let selection_start_rows: HashSet<u32> = old_selections
|
|
|
|
.into_iter()
|
|
|
|
.map(|selection| selection.start.row())
|
|
|
|
.collect();
|
|
|
|
let edits = selection_start_rows.into_iter().map(|row| {
|
|
|
|
let (indent, _) = map.line_indent(row);
|
|
|
|
let start_of_line = map
|
|
|
|
.clip_point(DisplayPoint::new(row, 0), Bias::Left)
|
|
|
|
.to_point(&map);
|
|
|
|
let mut new_text = " ".repeat(indent as usize);
|
|
|
|
new_text.push('\n');
|
|
|
|
(start_of_line..start_of_line, new_text)
|
2022-04-22 16:43:15 +00:00
|
|
|
});
|
2022-05-03 17:29:57 +00:00
|
|
|
editor.edit_with_autoindent(edits, cx);
|
2022-04-29 23:14:01 +00:00
|
|
|
editor.move_cursors(cx, |map, mut cursor, _| {
|
|
|
|
*cursor.row_mut() -= 1;
|
|
|
|
*cursor.column_mut() = map.line_len(cursor.row());
|
|
|
|
(map.clip_point(cursor, Bias::Left), SelectionGoal::None)
|
2022-04-22 16:43:15 +00:00
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2022-04-29 23:14:01 +00:00
|
|
|
fn insert_line_below(_: &mut Workspace, _: &InsertLineBelow, cx: &mut ViewContext<Workspace>) {
|
2022-04-22 16:43:15 +00:00
|
|
|
Vim::update(cx, |vim, cx| {
|
|
|
|
vim.switch_mode(Mode::Insert, cx);
|
|
|
|
vim.update_active_editor(cx, |editor, cx| {
|
|
|
|
editor.transact(cx, |editor, cx| {
|
2022-04-29 23:14:01 +00:00
|
|
|
let (map, old_selections) = editor.display_selections(cx);
|
|
|
|
let selection_end_rows: HashSet<u32> = old_selections
|
|
|
|
.into_iter()
|
|
|
|
.map(|selection| selection.end.row())
|
|
|
|
.collect();
|
|
|
|
let edits = selection_end_rows.into_iter().map(|row| {
|
|
|
|
let (indent, _) = map.line_indent(row);
|
|
|
|
let end_of_line = map
|
|
|
|
.clip_point(DisplayPoint::new(row, map.line_len(row)), Bias::Left)
|
|
|
|
.to_point(&map);
|
|
|
|
let mut new_text = "\n".to_string();
|
|
|
|
new_text.push_str(&" ".repeat(indent as usize));
|
|
|
|
(end_of_line..end_of_line, new_text)
|
2022-04-22 16:43:15 +00:00
|
|
|
});
|
2022-04-29 23:14:01 +00:00
|
|
|
editor.move_cursors(cx, |map, cursor, goal| {
|
|
|
|
Motion::EndOfLine.move_point(map, cursor, goal)
|
2022-04-22 16:43:15 +00:00
|
|
|
});
|
2022-05-03 17:29:57 +00:00
|
|
|
editor.edit_with_autoindent(edits, cx);
|
2022-04-22 16:43:15 +00:00
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2022-03-28 00:58:28 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use indoc::indoc;
|
2022-05-03 17:29:57 +00:00
|
|
|
use language::Selection;
|
2022-03-28 00:58:28 +00:00
|
|
|
use util::test::marked_text;
|
|
|
|
|
2022-04-15 23:00:44 +00:00
|
|
|
use crate::{
|
|
|
|
state::{
|
|
|
|
Mode::{self, *},
|
|
|
|
Namespace, Operator,
|
|
|
|
},
|
|
|
|
vim_test_context::VimTestContext,
|
|
|
|
};
|
2022-03-28 00:58:28 +00:00
|
|
|
|
|
|
|
#[gpui::test]
|
2022-04-21 23:14:58 +00:00
|
|
|
async fn test_h(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["h"]);
|
|
|
|
cx.assert("The q|uick", "The |quick");
|
|
|
|
cx.assert("|The quick", "|The quick");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|brown"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|brown"},
|
|
|
|
);
|
|
|
|
}
|
2022-03-28 00:58:28 +00:00
|
|
|
|
2022-04-21 23:14:58 +00:00
|
|
|
#[gpui::test]
|
2022-04-22 16:43:15 +00:00
|
|
|
async fn test_backspace(cx: &mut gpui::TestAppContext) {
|
2022-04-21 23:14:58 +00:00
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
2022-04-22 16:43:15 +00:00
|
|
|
let mut cx = cx.binding(["backspace"]);
|
|
|
|
cx.assert("The q|uick", "The |quick");
|
|
|
|
cx.assert("|The quick", "|The quick");
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
2022-04-22 16:43:15 +00:00
|
|
|
The quick
|
|
|
|
|brown"},
|
2022-04-21 23:14:58 +00:00
|
|
|
indoc! {"
|
2022-04-22 16:43:15 +00:00
|
|
|
The quick
|
|
|
|
|brown"},
|
2022-04-21 23:14:58 +00:00
|
|
|
);
|
|
|
|
}
|
2022-03-28 00:58:28 +00:00
|
|
|
|
2022-04-21 23:14:58 +00:00
|
|
|
#[gpui::test]
|
|
|
|
async fn test_j(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["j"]);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The |quick
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brow|n fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brow|n fox"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brow|n fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quic|k
|
|
|
|
brown"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brow|n"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|brown"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|brown"},
|
|
|
|
);
|
|
|
|
}
|
2022-03-28 00:58:28 +00:00
|
|
|
|
2022-04-21 23:14:58 +00:00
|
|
|
#[gpui::test]
|
|
|
|
async fn test_k(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["k"]);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The |quick
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
The |quick
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brow|n fox"},
|
|
|
|
indoc! {"
|
|
|
|
The |quick
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The
|
|
|
|
quic|k"},
|
|
|
|
indoc! {"
|
|
|
|
Th|e
|
|
|
|
quick"},
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|
|
|
|
|
2022-04-22 16:43:15 +00:00
|
|
|
#[gpui::test]
|
|
|
|
async fn test_l(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["l"]);
|
|
|
|
cx.assert("The q|uick", "The qu|ick");
|
|
|
|
cx.assert("The quic|k", "The quic|k");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quic|k
|
|
|
|
brown"},
|
|
|
|
indoc! {"
|
|
|
|
The quic|k
|
|
|
|
brown"},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-03-28 00:58:28 +00:00
|
|
|
#[gpui::test]
|
|
|
|
async fn test_jump_to_line_boundaries(cx: &mut gpui::TestAppContext) {
|
2022-04-21 23:14:58 +00:00
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["shift-$"]);
|
|
|
|
cx.assert("T|est test", "Test tes|t");
|
|
|
|
cx.assert("Test tes|t", "Test tes|t");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The |quick
|
|
|
|
brown"},
|
|
|
|
indoc! {"
|
|
|
|
The quic|k
|
|
|
|
brown"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quic|k
|
|
|
|
brown"},
|
|
|
|
indoc! {"
|
|
|
|
The quic|k
|
|
|
|
brown"},
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
|
2022-04-21 23:14:58 +00:00
|
|
|
let mut cx = cx.binding(["0"]);
|
|
|
|
cx.assert("Test |test", "|Test test");
|
|
|
|
cx.assert("|Test test", "|Test test");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The |quick
|
|
|
|
brown"},
|
|
|
|
indoc! {"
|
|
|
|
|The quick
|
|
|
|
brown"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
|The quick
|
|
|
|
brown"},
|
|
|
|
indoc! {"
|
|
|
|
|The quick
|
|
|
|
brown"},
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_jump_to_end(cx: &mut gpui::TestAppContext) {
|
2022-04-21 23:14:58 +00:00
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["shift-G"]);
|
2022-04-19 18:36:44 +00:00
|
|
|
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.assert(
|
2022-04-19 18:36:44 +00:00
|
|
|
indoc! {"
|
2022-04-21 23:14:58 +00:00
|
|
|
The |quick
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over the lazy dog"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over| the lazy dog"},
|
2022-04-19 18:36:44 +00:00
|
|
|
);
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over| the lazy dog"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over| the lazy dog"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The qui|ck
|
|
|
|
|
|
|
|
brown"},
|
|
|
|
indoc! {"
|
2022-03-28 00:58:28 +00:00
|
|
|
The quick
|
|
|
|
|
2022-04-21 23:14:58 +00:00
|
|
|
brow|n"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The qui|ck
|
|
|
|
|
|
|
|
"},
|
|
|
|
indoc! {"
|
2022-03-28 00:58:28 +00:00
|
|
|
The quick
|
|
|
|
|
2022-04-21 23:14:58 +00:00
|
|
|
|"},
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
2022-04-22 16:43:15 +00:00
|
|
|
async fn test_w(cx: &mut gpui::TestAppContext) {
|
2022-04-21 23:14:58 +00:00
|
|
|
let mut cx = VimTestContext::new(cx, true).await;
|
|
|
|
let (_, cursor_offsets) = marked_text(indoc! {"
|
2022-03-28 00:58:28 +00:00
|
|
|
The |quick|-|brown
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|fox_jumps |over
|
|
|
|
|th||e"});
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.set_state(
|
|
|
|
indoc! {"
|
|
|
|
|The quick-brown
|
|
|
|
|
|
|
|
|
|
|
|
fox_jumps over
|
|
|
|
the"},
|
|
|
|
Mode::Normal,
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
|
|
|
|
for cursor_offset in cursor_offsets {
|
|
|
|
cx.simulate_keystroke("w");
|
2022-05-03 17:29:57 +00:00
|
|
|
cx.assert_editor_selections(vec![Selection::from_offset(cursor_offset)]);
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Reset and test ignoring punctuation
|
|
|
|
let (_, cursor_offsets) = marked_text(indoc! {"
|
|
|
|
The |quick-brown
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|fox_jumps |over
|
|
|
|
|th||e"});
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.set_state(
|
|
|
|
indoc! {"
|
|
|
|
|The quick-brown
|
|
|
|
|
|
|
|
|
|
|
|
fox_jumps over
|
|
|
|
the"},
|
|
|
|
Mode::Normal,
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
|
|
|
|
for cursor_offset in cursor_offsets {
|
|
|
|
cx.simulate_keystroke("shift-W");
|
2022-05-03 17:29:57 +00:00
|
|
|
cx.assert_editor_selections(vec![Selection::from_offset(cursor_offset)]);
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
2022-04-22 16:43:15 +00:00
|
|
|
async fn test_e(cx: &mut gpui::TestAppContext) {
|
2022-04-21 23:14:58 +00:00
|
|
|
let mut cx = VimTestContext::new(cx, true).await;
|
|
|
|
let (_, cursor_offsets) = marked_text(indoc! {"
|
2022-03-28 00:58:28 +00:00
|
|
|
Th|e quic|k|-brow|n
|
|
|
|
|
|
|
|
|
|
|
|
fox_jump|s ove|r
|
|
|
|
th|e"});
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.set_state(
|
|
|
|
indoc! {"
|
|
|
|
|The quick-brown
|
|
|
|
|
|
|
|
|
|
|
|
fox_jumps over
|
|
|
|
the"},
|
|
|
|
Mode::Normal,
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
|
|
|
|
for cursor_offset in cursor_offsets {
|
|
|
|
cx.simulate_keystroke("e");
|
2022-05-03 17:29:57 +00:00
|
|
|
cx.assert_editor_selections(vec![Selection::from_offset(cursor_offset)]);
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Reset and test ignoring punctuation
|
|
|
|
let (_, cursor_offsets) = marked_text(indoc! {"
|
|
|
|
Th|e quick-brow|n
|
|
|
|
|
|
|
|
|
|
|
|
fox_jump|s ove|r
|
|
|
|
th||e"});
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.set_state(
|
|
|
|
indoc! {"
|
|
|
|
|The quick-brown
|
|
|
|
|
|
|
|
|
|
|
|
fox_jumps over
|
|
|
|
the"},
|
|
|
|
Mode::Normal,
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
for cursor_offset in cursor_offsets {
|
|
|
|
cx.simulate_keystroke("shift-E");
|
2022-05-03 17:29:57 +00:00
|
|
|
cx.assert_editor_selections(vec![Selection::from_offset(cursor_offset)]);
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
2022-04-22 16:43:15 +00:00
|
|
|
async fn test_b(cx: &mut gpui::TestAppContext) {
|
2022-04-21 23:14:58 +00:00
|
|
|
let mut cx = VimTestContext::new(cx, true).await;
|
|
|
|
let (_, cursor_offsets) = marked_text(indoc! {"
|
2022-03-28 00:58:28 +00:00
|
|
|
||The |quick|-|brown
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|fox_jumps |over
|
|
|
|
|the"});
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.set_state(
|
|
|
|
indoc! {"
|
|
|
|
The quick-brown
|
|
|
|
|
|
|
|
|
|
|
|
fox_jumps over
|
|
|
|
th|e"},
|
|
|
|
Mode::Normal,
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
|
|
|
|
for cursor_offset in cursor_offsets.into_iter().rev() {
|
|
|
|
cx.simulate_keystroke("b");
|
2022-05-03 17:29:57 +00:00
|
|
|
cx.assert_editor_selections(vec![Selection::from_offset(cursor_offset)]);
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Reset and test ignoring punctuation
|
|
|
|
let (_, cursor_offsets) = marked_text(indoc! {"
|
|
|
|
||The |quick-brown
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|fox_jumps |over
|
|
|
|
|the"});
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.set_state(
|
|
|
|
indoc! {"
|
|
|
|
The quick-brown
|
|
|
|
|
|
|
|
|
|
|
|
fox_jumps over
|
|
|
|
th|e"},
|
|
|
|
Mode::Normal,
|
|
|
|
);
|
2022-03-28 00:58:28 +00:00
|
|
|
for cursor_offset in cursor_offsets.into_iter().rev() {
|
|
|
|
cx.simulate_keystroke("shift-B");
|
2022-05-03 17:29:57 +00:00
|
|
|
cx.assert_editor_selections(vec![Selection::from_offset(cursor_offset)]);
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|
|
|
|
}
|
2022-04-15 23:00:44 +00:00
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_g_prefix_and_abort(cx: &mut gpui::TestAppContext) {
|
2022-04-21 23:14:58 +00:00
|
|
|
let mut cx = VimTestContext::new(cx, true).await;
|
2022-04-15 23:00:44 +00:00
|
|
|
|
|
|
|
// Can abort with escape to get back to normal mode
|
|
|
|
cx.simulate_keystroke("g");
|
|
|
|
assert_eq!(cx.mode(), Normal);
|
|
|
|
assert_eq!(
|
|
|
|
cx.active_operator(),
|
|
|
|
Some(Operator::Namespace(Namespace::G))
|
|
|
|
);
|
|
|
|
cx.simulate_keystroke("escape");
|
|
|
|
assert_eq!(cx.mode(), Normal);
|
|
|
|
assert_eq!(cx.active_operator(), None);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
2022-04-22 16:43:15 +00:00
|
|
|
async fn test_gg(cx: &mut gpui::TestAppContext) {
|
2022-04-21 23:14:58 +00:00
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["g", "g"]);
|
|
|
|
cx.assert(
|
2022-04-19 18:36:44 +00:00
|
|
|
indoc! {"
|
2022-04-21 23:14:58 +00:00
|
|
|
The quick
|
2022-04-15 23:00:44 +00:00
|
|
|
|
2022-04-21 23:14:58 +00:00
|
|
|
brown fox jumps
|
|
|
|
over |the lazy dog"},
|
2022-04-15 23:00:44 +00:00
|
|
|
indoc! {"
|
2022-04-21 23:14:58 +00:00
|
|
|
The q|uick
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over the lazy dog"},
|
2022-04-15 23:00:44 +00:00
|
|
|
);
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.assert(
|
2022-04-19 18:36:44 +00:00
|
|
|
indoc! {"
|
2022-04-21 23:14:58 +00:00
|
|
|
The q|uick
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over the lazy dog"},
|
2022-04-19 18:36:44 +00:00
|
|
|
indoc! {"
|
2022-04-21 23:14:58 +00:00
|
|
|
The q|uick
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over the lazy dog"},
|
2022-04-19 18:36:44 +00:00
|
|
|
);
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.assert(
|
2022-04-19 18:36:44 +00:00
|
|
|
indoc! {"
|
2022-04-21 23:14:58 +00:00
|
|
|
The quick
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over the la|zy dog"},
|
2022-04-19 18:36:44 +00:00
|
|
|
indoc! {"
|
2022-04-21 23:14:58 +00:00
|
|
|
The quic|k
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over the lazy dog"},
|
2022-04-19 18:36:44 +00:00
|
|
|
);
|
2022-04-21 23:14:58 +00:00
|
|
|
cx.assert(
|
2022-04-19 18:36:44 +00:00
|
|
|
indoc! {"
|
2022-04-21 23:14:58 +00:00
|
|
|
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over the la|zy dog"},
|
2022-04-19 18:36:44 +00:00
|
|
|
indoc! {"
|
2022-04-21 23:14:58 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
brown fox jumps
|
|
|
|
over the lazy dog"},
|
2022-04-19 18:36:44 +00:00
|
|
|
);
|
2022-04-15 23:00:44 +00:00
|
|
|
}
|
2022-04-22 16:43:15 +00:00
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_a(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["a"]).mode_after(Mode::Insert);
|
|
|
|
|
|
|
|
cx.assert("The q|uick", "The qu|ick");
|
|
|
|
cx.assert("The quic|k", "The quick|");
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_insert_end_of_line(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["shift-A"]).mode_after(Mode::Insert);
|
|
|
|
cx.assert("The q|uick", "The quick|");
|
|
|
|
cx.assert("The q|uick ", "The quick |");
|
|
|
|
cx.assert("|", "|");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The q|uick
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
The quick|
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick"},
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick"},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_jump_to_first_non_whitespace(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["shift-^"]);
|
|
|
|
cx.assert("The q|uick", "|The quick");
|
|
|
|
cx.assert(" The q|uick", " |The quick");
|
|
|
|
cx.assert("|", "|");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The q|uick
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
|The quick
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick"},
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick"},
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick"},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_insert_first_non_whitespace(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["shift-I"]).mode_after(Mode::Insert);
|
|
|
|
cx.assert("The q|uick", "|The quick");
|
|
|
|
cx.assert(" The q|uick", " |The quick");
|
|
|
|
cx.assert("|", "|");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The q|uick
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
|The quick
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick"},
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick"},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_delete_to_end_of_line(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["shift-D"]);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The q|uick
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
The |q
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_x(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["x"]);
|
|
|
|
cx.assert("|Test", "|est");
|
|
|
|
cx.assert("Te|st", "Te|t");
|
|
|
|
cx.assert("Tes|t", "Te|s");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
Tes|t
|
|
|
|
test"},
|
|
|
|
indoc! {"
|
|
|
|
Te|s
|
|
|
|
test"},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_delete_left(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["shift-X"]);
|
|
|
|
cx.assert("Te|st", "T|st");
|
|
|
|
cx.assert("T|est", "|est");
|
|
|
|
cx.assert("|Test", "|Test");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
Test
|
|
|
|
|test"},
|
|
|
|
indoc! {"
|
|
|
|
Test
|
|
|
|
|test"},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_o(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["o"]).mode_after(Mode::Insert);
|
|
|
|
|
|
|
|
cx.assert(
|
|
|
|
"|",
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
"The |quick",
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown |fox
|
|
|
|
jumps over"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown fox
|
|
|
|
|
|
|
|
|
jumps over"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown fox
|
|
|
|
jumps |over"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown fox
|
|
|
|
jumps over
|
|
|
|
|"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The q|uick
|
|
|
|
brown fox
|
|
|
|
jumps over"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
brown fox
|
|
|
|
jumps over"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
2022-05-03 17:29:57 +00:00
|
|
|
fn test()
|
|
|
|
println!(|);"},
|
2022-04-22 16:43:15 +00:00
|
|
|
indoc! {"
|
2022-05-03 17:29:57 +00:00
|
|
|
fn test()
|
2022-04-22 16:43:15 +00:00
|
|
|
println!();
|
2022-05-03 17:29:57 +00:00
|
|
|
|"},
|
2022-04-22 16:43:15 +00:00
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
2022-05-03 17:29:57 +00:00
|
|
|
fn test(|)
|
|
|
|
println!();"},
|
2022-04-22 16:43:15 +00:00
|
|
|
indoc! {"
|
2022-05-03 17:29:57 +00:00
|
|
|
fn test()
|
2022-04-22 16:43:15 +00:00
|
|
|
|
|
2022-05-03 17:29:57 +00:00
|
|
|
println!();"},
|
2022-04-22 16:43:15 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_insert_line_above(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["shift-O"]).mode_after(Mode::Insert);
|
|
|
|
|
|
|
|
cx.assert(
|
|
|
|
"|",
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
"The |quick",
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown |fox
|
|
|
|
jumps over"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
brown fox
|
|
|
|
jumps over"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown fox
|
|
|
|
jumps |over"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown fox
|
|
|
|
|
|
|
|
|
jumps over"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The q|uick
|
|
|
|
brown fox
|
|
|
|
jumps over"},
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
The quick
|
|
|
|
brown fox
|
|
|
|
jumps over"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
2022-05-03 17:29:57 +00:00
|
|
|
fn test()
|
|
|
|
println!(|);"},
|
2022-04-22 16:43:15 +00:00
|
|
|
indoc! {"
|
2022-05-03 17:29:57 +00:00
|
|
|
fn test()
|
2022-04-22 16:43:15 +00:00
|
|
|
|
|
2022-05-03 17:29:57 +00:00
|
|
|
println!();"},
|
2022-04-22 16:43:15 +00:00
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
2022-05-03 17:29:57 +00:00
|
|
|
fn test(|)
|
|
|
|
println!();"},
|
2022-04-22 16:43:15 +00:00
|
|
|
indoc! {"
|
|
|
|
|
|
2022-05-03 17:29:57 +00:00
|
|
|
fn test()
|
|
|
|
println!();"},
|
2022-04-22 16:43:15 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_dd(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["d", "d"]);
|
|
|
|
|
|
|
|
cx.assert("|", "|");
|
|
|
|
cx.assert("The |quick", "|");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown |fox
|
|
|
|
jumps over"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
jumps |over"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown fox
|
|
|
|
jumps |over"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown |fox"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The q|uick
|
|
|
|
brown fox
|
|
|
|
jumps over"},
|
|
|
|
indoc! {"
|
|
|
|
brown| fox
|
|
|
|
jumps over"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|brown fox"},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[gpui::test]
|
|
|
|
async fn test_cc(cx: &mut gpui::TestAppContext) {
|
|
|
|
let cx = VimTestContext::new(cx, true).await;
|
|
|
|
let mut cx = cx.binding(["c", "c"]).mode_after(Mode::Insert);
|
|
|
|
|
|
|
|
cx.assert("|", "|");
|
|
|
|
cx.assert("The |quick", "|");
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown |fox
|
|
|
|
jumps over"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
jumps over"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown fox
|
|
|
|
jumps |over"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
brown fox
|
|
|
|
|"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The q|uick
|
|
|
|
brown fox
|
|
|
|
jumps over"},
|
|
|
|
indoc! {"
|
|
|
|
|
|
|
|
|
brown fox
|
|
|
|
jumps over"},
|
|
|
|
);
|
|
|
|
cx.assert(
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
brown fox"},
|
|
|
|
indoc! {"
|
|
|
|
The quick
|
|
|
|
|
|
|
|
|
brown fox"},
|
|
|
|
);
|
|
|
|
}
|
2022-03-28 00:58:28 +00:00
|
|
|
}
|