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

Move if statement further up

Browse source
This commit is contained in:
Conrad Irwin 2025-08-14 21:33:56 -06:00
parent 35477d9d99
commit 55f3f6c60f
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/vim/src/normal/search.rs
View file

@ -231,14 +231,8 @@ impl Vim {
count = count.saturating_sub(1) count = count.saturating_sub(1)
} }
self.search.count = 1; self.search.count = 1;
// If search was initiated with vim shortcut '/', focus on editor, else if initiated search_bar.select_match(direction, count, window, cx);
// via standard search shortcut, keep search bar focused (and always move by count=1). search_bar.focus_editor(&Default::default(), window, cx);
if self.search.vim_mode_search {
search_bar.select_match(direction, count, window, cx);
search_bar.focus_editor(&Default::default(), window, cx);
} else {
search_bar.select_match(direction, 1, window, cx);
}
let prior_selections: Vec<_> = self.search.prior_selections.drain(..).collect(); let prior_selections: Vec<_> = self.search.prior_selections.drain(..).collect();
let prior_mode = self.search.prior_mode; let prior_mode = self.search.prior_mode;

8
crates/vim/src/vim.rs
View file

@ -336,8 +336,12 @@ pub fn init(cx: &mut App) {
.and_then(|item| item.act_as::<Editor>(cx)) .and_then(|item| item.act_as::<Editor>(cx))
.and_then(|editor| editor.read(cx).addon::<VimAddon>().cloned()); .and_then(|editor| editor.read(cx).addon::<VimAddon>().cloned());
let Some(vim) = vim else { return }; let Some(vim) = vim else { return };
vim.entity.update(cx, |_, cx| { vim.entity.update(cx, |vim, cx| {
cx.defer_in(window, |vim, window, cx| vim.search_submit(window, cx)) if vim.search.vim_mode_search {
cx.defer_in(window, |vim, window, cx| vim.search_submit(window, cx))
} else {
cx.propagate()
}
}) })
}); });
}) })