Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vim: Fix edge-case in } when trailing newline is absent

Browse source 
Added .assert_shared_state() to NeovimBackedTestContext – although it's
not strictly necessary to show the expected behaviour in the test file
(as we can just compare to neovim's JSON recording), it makes it much
easier to understand what we're testing.
This commit is contained in:
Conrad Irwin 2023-06-29 23:24:51 -06:00
parent 9ee2707d43
commit abb58c41db
4 changed files with 94 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

52
crates/vim/src/motion.rs
View file

@ -255,7 +255,7 @@ impl Motion {
SelectionGoal::None,
),
EndOfParagraph => (
movement::end_of_paragraph(map, point, times),
map.clip_at_line_end(movement::end_of_paragraph(map, point, times)),
SelectionGoal::None,
),
CurrentLine => (end_of_line(map, point), SelectionGoal::None),
@ -618,12 +618,12 @@ fn next_line_start(map: &DisplaySnapshot, point: DisplayPoint, times: usize) ->
mod test {
use crate::{state::Mode, test::VimTestContext};
use crate::test::NeovimBackedTestContext;
use indoc::indoc;
#[gpui::test]
async fn test_start_end_of_paragraph(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
let mut cx = NeovimBackedTestContext::new(cx).await;
let initial_state = indoc! {r"ˇabc
def
@ -637,10 +637,9 @@ mod test {
final"};
// goes down once
cx.set_state(initial_state, Mode::Normal);
cx.simulate_keystrokes(["}"]);
cx.assert_state(
indoc! {r"abc
cx.set_shared_state(initial_state).await;
cx.simulate_shared_keystrokes(["}"]).await;
cx.assert_shared_state(indoc! {r"abc
def
ˇ
paragraph
@ -649,18 +648,16 @@ mod test {
third and
final"},
Mode::Normal,
);
final"})
.await;
// goes up once
cx.simulate_keystrokes(["{"]);
cx.assert_state(initial_state, Mode::Normal);
cx.simulate_shared_keystrokes(["{"]).await;
cx.assert_shared_state(initial_state).await;
// goes down twice
cx.simulate_keystrokes(["2", "}"]);
cx.assert_state(
indoc! {r"abc
cx.simulate_shared_keystrokes(["2", "}"]).await;
cx.assert_shared_state(indoc! {r"abc
def
paragraph
@ -669,14 +666,12 @@ mod test {
third and
final"},
Mode::Normal,
);
final"})
.await;
// goes down over multiple blanks
cx.simulate_keystrokes(["}"]);
cx.assert_state(
indoc! {r"abc
cx.simulate_shared_keystrokes(["}"]).await;
cx.assert_shared_state(indoc! {r"abc
def
paragraph
@ -685,14 +680,12 @@ mod test {
third and
finalˇ"},
Mode::Normal,
);
finaˇl"})
.await;
// goes up twice
cx.simulate_keystrokes(["2", "{"]);
cx.assert_state(
indoc! {r"abc
cx.simulate_shared_keystrokes(["2", "{"]).await;
cx.assert_shared_state(indoc! {r"abc
def
ˇ
paragraph
@ -701,8 +694,7 @@ mod test {
third and
final"},
Mode::Normal,
)
final"})
.await
}
}