oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix scroll tests

Browse Source 
For some reason in gpui2, the window contains an extra 59px of space..
This commit is contained in:
Conrad Irwin
2023-12-11 16:12:17 -07:00
parent 2d59492aac
commit 3779316e4e
2 changed files with 157 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/vim2/src/test/neovim_backed_test_context.rs
+30 -13
View File
@@ -2,6 +2,7 @@
// todo!()
use editor::{scroll::VERTICAL_SCROLL_MARGIN, test::editor_test_context::ContextHandle};
use gpui::{point, px, rems, size, Context};
use indoc::indoc;
use settings::SettingsStore;
use std::{
@@ -153,20 +154,36 @@ impl<'a> NeovimBackedTestContext<'a> {
})
}
// todo!()
// pub async fn set_scroll_height(&mut self, rows: u32) {
// // match Zed's scrolling behavior
// self.neovim
// .set_option(&format!("scrolloff={}", VERTICAL_SCROLL_MARGIN))
// .await;
// // +2 to account for the vim command UI at the bottom.
// self.neovim.set_option(&format!("lines={}", rows + 2)).await;
// let window = self.window;
// let line_height =
// self.editor(|editor, cx| editor.style().text.line_height(cx.font_cache()));
pub async fn set_scroll_height(&mut self, rows: u32) {
// match Zed's scrolling behavior
self.neovim
.set_option(&format!("scrolloff={}", VERTICAL_SCROLL_MARGIN))
.await;
// +2 to account for the vim command UI at the bottom.
self.neovim.set_option(&format!("lines={}", rows + 2)).await;
let (line_height, visible_line_count) = self.editor(|editor, cx| {
(
editor
.style()
.unwrap()
.text
.line_height_in_pixels(cx.rem_size()),
editor.visible_line_count().unwrap(),
)
});
// window.simulate_resize(vec2f(1000., (rows as f32) * line_height), &mut self.cx);
// }
let window = self.window;
let margin = self
.update_window(window, |_, cx| {
cx.viewport_size().height - line_height * visible_line_count
})
.unwrap();
self.simulate_window_resize(
self.window,
size(px(1000.), margin + (rows as f32) * line_height),
);
}
pub async fn set_neovim_option(&mut self, option: &str) {
self.neovim.set_option(option).await;