vim: Add support for moving to first, middle and last visible lines (H, L, M) (#6919)
This change implements the vim [motion](https://github.com/vim/vim/blob/master/runtime/doc/motion.txt) commands to move the cursor to the top, middle and bottom of the visible view. This feature is requested in https://github.com/zed-industries/zed/issues/4941. This change takes inspiration from [crates/vim/src/normal/scroll.rs](https://github.com/zed-industries/zed/blob/main/crates/vim/src/normal/scroll.rs). A note on the behavior of these commands: Because `NeovimBackedTestContext` requires compatibility with nvim, the current implementation causes slightly non-standard behavior: it causes the editor to scroll a few lines. The standard behavior causes no scrolling. It is easy enough to account for the margin by adding `VERTICAL_SCROLL_MARGIN`. However, doing so will cause test failures due to the disparity between nvim and zed states. Perhaps `NeovimBackedTestContext` should have a switch to be more tolerant for such cases. Release Notes: - Added support for moving to top, middle and bottom of the screen in vim mode (`H`, `M`, and `L`) ([#4941](https://github.com/zed-industries/zed/issues/4941)).
This commit is contained in:
@@ -586,6 +586,8 @@ impl DisplaySnapshot {
|
||||
text_system,
|
||||
editor_style,
|
||||
rem_size,
|
||||
anchor: _,
|
||||
visible_rows: _,
|
||||
}: &TextLayoutDetails,
|
||||
) -> Arc<LineLayout> {
|
||||
let mut runs = Vec::new();
|
||||
|
||||
@@ -3052,6 +3052,8 @@ impl Editor {
|
||||
text_system: cx.text_system().clone(),
|
||||
editor_style: self.style.clone().unwrap(),
|
||||
rem_size: cx.rem_size(),
|
||||
anchor: self.scroll_manager.anchor().anchor,
|
||||
visible_rows: self.visible_line_count(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,8 @@ use language::Point;
|
||||
|
||||
use std::{ops::Range, sync::Arc};
|
||||
|
||||
use multi_buffer::Anchor;
|
||||
|
||||
/// Defines search strategy for items in `movement` module.
|
||||
/// `FindRange::SingeLine` only looks for a match on a single line at a time, whereas
|
||||
/// `FindRange::MultiLine` keeps going until the end of a string.
|
||||
@@ -23,6 +25,8 @@ pub struct TextLayoutDetails {
|
||||
pub(crate) text_system: Arc<TextSystem>,
|
||||
pub(crate) editor_style: EditorStyle,
|
||||
pub(crate) rem_size: Pixels,
|
||||
pub anchor: Anchor,
|
||||
pub visible_rows: Option<f32>,
|
||||
}
|
||||
|
||||
/// Returns a column to the left of the current point, wrapping
|
||||
|
||||
@@ -299,7 +299,7 @@ impl ScrollManager {
|
||||
}
|
||||
|
||||
impl Editor {
|
||||
pub fn vertical_scroll_margin(&mut self) -> usize {
|
||||
pub fn vertical_scroll_margin(&self) -> usize {
|
||||
self.scroll_manager.vertical_scroll_margin as usize
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user