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

vim: Fix some problems with visual mode testing (#8461)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Conrad Irwin 2024-02-26 20:15:27 -07:00 • committed by GitHub
parent 079c31fcac
commit 8cf36ae603
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 43 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/vim/src/test/neovim_backed_test_context.rs
View file

@ -190,8 +190,10 @@ impl NeovimBackedTestContext {
self.is_dirty = false;
let marked_text = marked_text.replace("•", " ");
let neovim = self.neovim_state().await;
let neovim_mode = self.neovim_mode().await;
let editor = self.editor_state();
if neovim == marked_text && neovim == editor {
let editor_mode = self.mode();
if neovim == marked_text && neovim == editor && neovim_mode == editor_mode {
return;
}
let initial_state = self
@ -213,16 +215,18 @@ impl NeovimBackedTestContext {
{}
# currently expected:
{}
# neovim state:
# neovim ({}):
{}
# zed state:
# zed ({}):
{}"},
message,
initial_state,
self.recent_keystrokes.join(" "),
marked_text.replace(" \n", "•\n"),
neovim_mode,
neovim.replace(" \n", "•\n"),
editor.replace(" \n", "•\n")
editor_mode,
editor.replace(" \n", "•\n"),
)
}
@ -296,27 +300,31 @@ impl NeovimBackedTestContext {
pub async fn assert_state_matches(&mut self) {
self.is_dirty = false;
let neovim = self.neovim_state().await;
let neovim_mode = self.neovim_mode().await;
let editor = self.editor_state();
let editor_mode = self.mode();
let initial_state = self
.last_set_state
.as_ref()
.unwrap_or(&"N/A".to_string())
.clone();
if neovim != editor {
if neovim != editor || neovim_mode != editor_mode {
panic!(
indoc! {"Test failed (zed does not match nvim behaviour)
# initial state:
{}
# keystrokes:
{}
# neovim state:
# neovim ({}):
{}
# zed state:
# zed ({}):
{}"},
initial_state,
self.recent_keystrokes.join(" "),
neovim_mode,
neovim,
editor_mode,
editor,
)
}