use editor::{Bias, Direction, Editor, display_map::ToDisplayPoint, movement, scroll::Autoscroll};use gpui::{Context, Window, actions}; use crate::{Vim, state::Mode}; actions!(vim, [ChangeListOlder, ChangeListNewer]); pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) { Vim::action(editor, cx, |vim, _: &ChangeListOlder, window, cx| { vim.move_to_change(Direction::Prev, window, cx); }); Vim::action(editor, cx, |vim, _: &ChangeListNewer, window, cx| { vim.move_to_change(Direction::Next, window, cx); });} impl Vim { fn move_to_change( &mut self, direction: Direction, window: &mut Window, cx: &mut Context<Self>, ) { let count = Vim::take_count(cx).unwrap_or(1); Vim::take_forced_motion(cx); self.update_editor(window, cx, |_, editor, window, cx| { if let Some(selections) = editor .change_list .next_change(count, direction) .map(|s| s.to_vec()) { editor.change_selections(Some(Autoscroll::fit()), window, cx, |s| { let map = s.display_map(); s.select_display_ranges(selections.iter().map(|a| { let point = a.to_display_point(&map); point..point })) }) }; }); } pub(crate) fn push_to_change_list(&mut self, window: &mut Window, cx: &mut Context<Self>) { let Some((new_positions, buffer)) = self.update_editor(window, cx, |vim, editor, _, cx| { let (map, selections) = editor.selections.all_adjusted_display(cx); let buffer = editor.buffer().clone(); let pop_state = editor .change_list .last() .map(|previous| { previous.len() == selections.len() && previous.iter().enumerate().all(|(ix, p)| { p.to_display_point(&map).row() == selections[ix].head().row() }) }) .unwrap_or(false); let new_positions = selections .into_iter() .map(|s| { let point = if vim.mode == Mode::Insert { movement::saturating_left(&map, s.head()) } else { s.head() }; map.display_point_to_anchor(point, Bias::Left) }) .collect::<Vec<_>>(); editor .change_list .push_to_change_list(pop_state, new_positions.clone()); (new_positions, buffer) }) else { return; }; self.set_mark(".".to_string(), new_positions, &buffer, window, cx) }} #[cfg(test)]mod test { use indoc::indoc; use crate::{state::Mode, test::NeovimBackedTestContext}; #[gpui::test] async fn test_change_list_insert(cx: &mut gpui::TestAppContext) { let mut cx = NeovimBackedTestContext::new(cx).await; cx.set_shared_state("ˇ").await; cx.simulate_shared_keystrokes("i 1 1 escape shift-o 2 2 escape shift-g o 3 3 escape") .await; cx.shared_state().await.assert_eq(indoc! { "22 11 3ˇ3" }); cx.simulate_shared_keystrokes("g ;").await; // NOTE: this matches nvim when I type it into it // but in tests, nvim always reports the column as 0... cx.assert_state( indoc! { "22 11 3ˇ3" }, Mode::Normal, ); cx.simulate_shared_keystrokes("g ;").await; cx.assert_state( indoc! { "2ˇ2 11 33" }, Mode::Normal, ); cx.simulate_shared_keystrokes("g ;").await; cx.assert_state( indoc! { "22 1ˇ1 33" }, Mode::Normal, ); cx.simulate_shared_keystrokes("g ,").await; cx.assert_state( indoc! { "2ˇ2 11 33" }, Mode::Normal, ); cx.simulate_shared_keystrokes("shift-g i 4 4 escape").await; cx.simulate_shared_keystrokes("g ;").await; cx.assert_state( indoc! { "22 11 34ˇ43" }, Mode::Normal, ); cx.simulate_shared_keystrokes("g ;").await; cx.assert_state( indoc! { "2ˇ2 11 3443" }, Mode::Normal, ); } #[gpui::test] async fn test_change_list_delete(cx: &mut gpui::TestAppContext) { let mut cx = NeovimBackedTestContext::new(cx).await; cx.set_shared_state(indoc! { "one two three fˇour"}) .await; cx.simulate_shared_keystrokes("x k d i w ^ x").await; cx.shared_state().await.assert_eq(indoc! { "ˇne• three fur"}); cx.simulate_shared_keystrokes("2 g ;").await; cx.shared_state().await.assert_eq(indoc! { "ne• three fˇur"}); cx.simulate_shared_keystrokes("g ,").await; cx.shared_state().await.assert_eq(indoc! { "ˇne• three fur"}); } #[gpui::test] async fn test_gi(cx: &mut gpui::TestAppContext) { let mut cx = NeovimBackedTestContext::new(cx).await; cx.set_shared_state(indoc! { "one two three fˇr"}) .await; cx.simulate_shared_keystrokes("i o escape k g i").await; cx.simulate_shared_keystrokes("u escape").await; cx.shared_state().await.assert_eq(indoc! { "one two three foˇur"}); } #[gpui::test] async fn test_dot_mark(cx: &mut gpui::TestAppContext) { let mut cx = NeovimBackedTestContext::new(cx).await; cx.set_shared_state(indoc! { "one two three fˇr"}) .await; cx.simulate_shared_keystrokes("i o escape k ` .").await; cx.shared_state().await.assert_eq(indoc! { "one two three fˇor"}); }}
use editor::{Bias, Direction, Editor, display_map::ToDisplayPoint, movement, scroll::Autoscroll};
use gpui::{Context, Window, actions};
use crate::{Vim, state::Mode};
actions!(vim, [ChangeListOlder, ChangeListNewer]);
pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
Vim::action(editor, cx, |vim, _: &ChangeListOlder, window, cx| {
vim.move_to_change(Direction::Prev, window, cx);
});
Vim::action(editor, cx, |vim, _: &ChangeListNewer, window, cx| {
vim.move_to_change(Direction::Next, window, cx);
});
}
impl Vim {
fn move_to_change(
&mut self,
direction: Direction,
window: &mut Window,
cx: &mut Context<Self>,
) {
let count = Vim::take_count(cx).unwrap_or(1);
Vim::take_forced_motion(cx);
self.update_editor(window, cx, |_, editor, window, cx| {
if let Some(selections) = editor
.change_list
.next_change(count, direction)
.map(|s| s.to_vec())
{
editor.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
let map = s.display_map();
s.select_display_ranges(selections.iter().map(|a| {
let point = a.to_display_point(&map);
point..point
}))
})
};
});
}
pub(crate) fn push_to_change_list(&mut self, window: &mut Window, cx: &mut Context<Self>) {
let Some((new_positions, buffer)) = self.update_editor(window, cx, |vim, editor, _, cx| {
let (map, selections) = editor.selections.all_adjusted_display(cx);
let buffer = editor.buffer().clone();
let pop_state = editor
.change_list
.last()
.map(|previous| {
previous.len() == selections.len()
&& previous.iter().enumerate().all(|(ix, p)| {
p.to_display_point(&map).row() == selections[ix].head().row()
})
})
.unwrap_or(false);
let new_positions = selections
.into_iter()
.map(|s| {
let point = if vim.mode == Mode::Insert {
movement::saturating_left(&map, s.head())
} else {
s.head()
};
map.display_point_to_anchor(point, Bias::Left)
})
.collect::<Vec<_>>();
editor
.change_list
.push_to_change_list(pop_state, new_positions.clone());
(new_positions, buffer)
}) else {
return;
};
self.set_mark(".".to_string(), new_positions, &buffer, window, cx)
}
}
#[cfg(test)]
mod test {
use indoc::indoc;
use crate::{state::Mode, test::NeovimBackedTestContext};
#[gpui::test]
async fn test_change_list_insert(cx: &mut gpui::TestAppContext) {
let mut cx = NeovimBackedTestContext::new(cx).await;
cx.set_shared_state("ˇ").await;
cx.simulate_shared_keystrokes("i 1 1 escape shift-o 2 2 escape shift-g o 3 3 escape")
.await;
cx.shared_state().await.assert_eq(indoc! {
"22
11
3ˇ3"
});
cx.simulate_shared_keystrokes("g ;").await;
// NOTE: this matches nvim when I type it into it
// but in tests, nvim always reports the column as 0...
cx.assert_state(
indoc! {
"22
11
3ˇ3"
},
Mode::Normal,
);
cx.simulate_shared_keystrokes("g ;").await;
cx.assert_state(
indoc! {
"2ˇ2
11
33"
},
Mode::Normal,
);
cx.simulate_shared_keystrokes("g ;").await;
cx.assert_state(
indoc! {
"22
1ˇ1
33"
},
Mode::Normal,
);
cx.simulate_shared_keystrokes("g ,").await;
cx.assert_state(
indoc! {
"2ˇ2
11
33"
},
Mode::Normal,
);
cx.simulate_shared_keystrokes("shift-g i 4 4 escape").await;
cx.simulate_shared_keystrokes("g ;").await;
cx.assert_state(
indoc! {
"22
11
34ˇ43"
},
Mode::Normal,
);
cx.simulate_shared_keystrokes("g ;").await;
cx.assert_state(
indoc! {
"2ˇ2
11
3443"
},
Mode::Normal,
);
}
#[gpui::test]
async fn test_change_list_delete(cx: &mut gpui::TestAppContext) {
let mut cx = NeovimBackedTestContext::new(cx).await;
cx.set_shared_state(indoc! {
"one two
three fˇour"})
.await;
cx.simulate_shared_keystrokes("x k d i w ^ x").await;
cx.shared_state().await.assert_eq(indoc! {
"ˇne•
three fur"});
cx.simulate_shared_keystrokes("2 g ;").await;
cx.shared_state().await.assert_eq(indoc! {
"ne•
three fˇur"});
cx.simulate_shared_keystrokes("g ,").await;
cx.shared_state().await.assert_eq(indoc! {
"ˇne•
three fur"});
}
#[gpui::test]
async fn test_gi(cx: &mut gpui::TestAppContext) {
let mut cx = NeovimBackedTestContext::new(cx).await;
cx.set_shared_state(indoc! {
"one two
three fˇr"})
.await;
cx.simulate_shared_keystrokes("i o escape k g i").await;
cx.simulate_shared_keystrokes("u escape").await;
cx.shared_state().await.assert_eq(indoc! {
"one two
three foˇur"});
}
#[gpui::test]
async fn test_dot_mark(cx: &mut gpui::TestAppContext) {
let mut cx = NeovimBackedTestContext::new(cx).await;
cx.set_shared_state(indoc! {
"one two
three fˇr"})
.await;
cx.simulate_shared_keystrokes("i o escape k ` .").await;
cx.shared_state().await.assert_eq(indoc! {
"one two
three fˇor"});
}
}