vim2 compiling (but mostly commented out)
This commit is contained in:
Conrad Irwin
parent
7a9f764aa0
commit
32837d67be
146 changed files with 22013 additions and 10 deletions
227
crates/vim2/src/normal/scroll.rs
Normal file
227
crates/vim2/src/normal/scroll.rs
Normal file
|
|
@ -0,0 +1,227 @@
|
|||
use crate::Vim;
|
||||
use editor::{
|
||||
display_map::ToDisplayPoint,
|
||||
scroll::{scroll_amount::ScrollAmount, VERTICAL_SCROLL_MARGIN},
|
||||
DisplayPoint, Editor,
|
||||
};
|
||||
use gpui::{actions, AppContext, ViewContext};
|
||||
use language::Bias;
|
||||
use workspace::Workspace;
|
||||
|
||||
actions!(LineUp, LineDown, ScrollUp, ScrollDown, PageUp, PageDown,);
|
||||
|
||||
pub fn init(cx: &mut AppContext) {
|
||||
// todo!()
|
||||
// cx.add_action(|_: &mut Workspace, _: &LineDown, cx| {
|
||||
// scroll(cx, false, |c| ScrollAmount::Line(c.unwrap_or(1.)))
|
||||
// });
|
||||
// cx.add_action(|_: &mut Workspace, _: &LineUp, cx| {
|
||||
// scroll(cx, false, |c| ScrollAmount::Line(-c.unwrap_or(1.)))
|
||||
// });
|
||||
// cx.add_action(|_: &mut Workspace, _: &PageDown, cx| {
|
||||
// scroll(cx, false, |c| ScrollAmount::Page(c.unwrap_or(1.)))
|
||||
// });
|
||||
// cx.add_action(|_: &mut Workspace, _: &PageUp, cx| {
|
||||
// scroll(cx, false, |c| ScrollAmount::Page(-c.unwrap_or(1.)))
|
||||
// });
|
||||
// cx.add_action(|_: &mut Workspace, _: &ScrollDown, cx| {
|
||||
// scroll(cx, true, |c| {
|
||||
// if let Some(c) = c {
|
||||
// ScrollAmount::Line(c)
|
||||
// } else {
|
||||
// ScrollAmount::Page(0.5)
|
||||
// }
|
||||
// })
|
||||
// });
|
||||
// cx.add_action(|_: &mut Workspace, _: &ScrollUp, cx| {
|
||||
// scroll(cx, true, |c| {
|
||||
// if let Some(c) = c {
|
||||
// ScrollAmount::Line(-c)
|
||||
// } else {
|
||||
// ScrollAmount::Page(-0.5)
|
||||
// }
|
||||
// })
|
||||
// });
|
||||
}
|
||||
|
||||
fn scroll(
|
||||
cx: &mut ViewContext<Workspace>,
|
||||
move_cursor: bool,
|
||||
by: fn(c: Option<f32>) -> ScrollAmount,
|
||||
) {
|
||||
Vim::update(cx, |vim, cx| {
|
||||
let amount = by(vim.take_count(cx).map(|c| c as f32));
|
||||
vim.update_active_editor(cx, |editor, cx| {
|
||||
scroll_editor(editor, move_cursor, &amount, cx)
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
fn scroll_editor(
|
||||
editor: &mut Editor,
|
||||
preserve_cursor_position: bool,
|
||||
amount: &ScrollAmount,
|
||||
cx: &mut ViewContext<Editor>,
|
||||
) {
|
||||
let should_move_cursor = editor.newest_selection_on_screen(cx).is_eq();
|
||||
let old_top_anchor = editor.scroll_manager.anchor().anchor;
|
||||
|
||||
editor.scroll_screen(amount, cx);
|
||||
if should_move_cursor {
|
||||
let visible_rows = if let Some(visible_rows) = editor.visible_line_count() {
|
||||
visible_rows as u32
|
||||
} else {
|
||||
return;
|
||||
};
|
||||
|
||||
let top_anchor = editor.scroll_manager.anchor().anchor;
|
||||
|
||||
editor.change_selections(None, cx, |s| {
|
||||
s.move_with(|map, selection| {
|
||||
let mut head = selection.head();
|
||||
let top = top_anchor.to_display_point(map);
|
||||
|
||||
if preserve_cursor_position {
|
||||
let old_top = old_top_anchor.to_display_point(map);
|
||||
let new_row = top.row() + selection.head().row() - old_top.row();
|
||||
head = map.clip_point(DisplayPoint::new(new_row, head.column()), Bias::Left)
|
||||
}
|
||||
let min_row = top.row() + VERTICAL_SCROLL_MARGIN as u32;
|
||||
let max_row = top.row() + visible_rows - VERTICAL_SCROLL_MARGIN as u32 - 1;
|
||||
|
||||
let new_head = if head.row() < min_row {
|
||||
map.clip_point(DisplayPoint::new(min_row, head.column()), Bias::Left)
|
||||
} else if head.row() > max_row {
|
||||
map.clip_point(DisplayPoint::new(max_row, head.column()), Bias::Left)
|
||||
} else {
|
||||
head
|
||||
};
|
||||
if selection.is_empty() {
|
||||
selection.collapse_to(new_head, selection.goal)
|
||||
} else {
|
||||
selection.set_head(new_head, selection.goal)
|
||||
};
|
||||
})
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// #[cfg(test)]
|
||||
// mod test {
|
||||
// use crate::{
|
||||
// state::Mode,
|
||||
// test::{NeovimBackedTestContext, VimTestContext},
|
||||
// };
|
||||
// use gpui::geometry::vector::vec2f;
|
||||
// use indoc::indoc;
|
||||
// use language::Point;
|
||||
|
||||
// #[gpui::test]
|
||||
// async fn test_scroll(cx: &mut gpui::TestAppContext) {
|
||||
// let mut cx = VimTestContext::new(cx, true).await;
|
||||
|
||||
// let window = cx.window;
|
||||
// let line_height = cx.editor(|editor, cx| editor.style().text.line_height(cx.font_cache()));
|
||||
// window.simulate_resize(vec2f(1000., 8.0 * line_height - 1.0), &mut cx);
|
||||
|
||||
// cx.set_state(
|
||||
// indoc!(
|
||||
// "ˇone
|
||||
// two
|
||||
// three
|
||||
// four
|
||||
// five
|
||||
// six
|
||||
// seven
|
||||
// eight
|
||||
// nine
|
||||
// ten
|
||||
// eleven
|
||||
// twelve
|
||||
// "
|
||||
// ),
|
||||
// Mode::Normal,
|
||||
// );
|
||||
|
||||
// cx.update_editor(|editor, cx| {
|
||||
// assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 0.))
|
||||
// });
|
||||
// cx.simulate_keystrokes(["ctrl-e"]);
|
||||
// cx.update_editor(|editor, cx| {
|
||||
// assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 1.))
|
||||
// });
|
||||
// cx.simulate_keystrokes(["2", "ctrl-e"]);
|
||||
// cx.update_editor(|editor, cx| {
|
||||
// assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 3.))
|
||||
// });
|
||||
// cx.simulate_keystrokes(["ctrl-y"]);
|
||||
// cx.update_editor(|editor, cx| {
|
||||
// assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 2.))
|
||||
// });
|
||||
|
||||
// // does not select in normal mode
|
||||
// cx.simulate_keystrokes(["g", "g"]);
|
||||
// cx.update_editor(|editor, cx| {
|
||||
// assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 0.))
|
||||
// });
|
||||
// cx.simulate_keystrokes(["ctrl-d"]);
|
||||
// cx.update_editor(|editor, cx| {
|
||||
// assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 3.0));
|
||||
// assert_eq!(
|
||||
// editor.selections.newest(cx).range(),
|
||||
// Point::new(6, 0)..Point::new(6, 0)
|
||||
// )
|
||||
// });
|
||||
|
||||
// // does select in visual mode
|
||||
// cx.simulate_keystrokes(["g", "g"]);
|
||||
// cx.update_editor(|editor, cx| {
|
||||
// assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 0.))
|
||||
// });
|
||||
// cx.simulate_keystrokes(["v", "ctrl-d"]);
|
||||
// cx.update_editor(|editor, cx| {
|
||||
// assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 3.0));
|
||||
// assert_eq!(
|
||||
// editor.selections.newest(cx).range(),
|
||||
// Point::new(0, 0)..Point::new(6, 1)
|
||||
// )
|
||||
// });
|
||||
// }
|
||||
// #[gpui::test]
|
||||
// async fn test_ctrl_d_u(cx: &mut gpui::TestAppContext) {
|
||||
// let mut cx = NeovimBackedTestContext::new(cx).await;
|
||||
|
||||
// cx.set_scroll_height(10).await;
|
||||
|
||||
// pub fn sample_text(rows: usize, cols: usize, start_char: char) -> String {
|
||||
// let mut text = String::new();
|
||||
// for row in 0..rows {
|
||||
// let c: char = (start_char as u32 + row as u32) as u8 as char;
|
||||
// let mut line = c.to_string().repeat(cols);
|
||||
// if row < rows - 1 {
|
||||
// line.push('\n');
|
||||
// }
|
||||
// text += &line;
|
||||
// }
|
||||
// text
|
||||
// }
|
||||
// let content = "ˇ".to_owned() + &sample_text(26, 2, 'a');
|
||||
// cx.set_shared_state(&content).await;
|
||||
|
||||
// // skip over the scrolloff at the top
|
||||
// // test ctrl-d
|
||||
// cx.simulate_shared_keystrokes(["4", "j", "ctrl-d"]).await;
|
||||
// cx.assert_state_matches().await;
|
||||
// cx.simulate_shared_keystrokes(["ctrl-d"]).await;
|
||||
// cx.assert_state_matches().await;
|
||||
// cx.simulate_shared_keystrokes(["g", "g", "ctrl-d"]).await;
|
||||
// cx.assert_state_matches().await;
|
||||
|
||||
// // test ctrl-u
|
||||
// cx.simulate_shared_keystrokes(["ctrl-u"]).await;
|
||||
// cx.assert_state_matches().await;
|
||||
// cx.simulate_shared_keystrokes(["ctrl-d", "ctrl-d", "4", "j", "ctrl-u", "ctrl-u"])
|
||||
// .await;
|
||||
// cx.assert_state_matches().await;
|
||||
// }
|
||||
// }
|
||||
Loading…
Add table
Add a link
Reference in a new issue