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

Merge 55f3f6c60f into 633ce23ae9

Browse source
This commit is contained in:
Vivek Jain 2025-08-25 21:33:31 -06:00 • committed by GitHub
commit d0c0f60043
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,6 +192,7 @@ impl Vim {
self.search = SearchState { self.search = SearchState {
direction, direction,
count, count,
vim_mode_search: true,
prior_selections, prior_selections,
prior_operator: self.operator_stack.last().cloned(), prior_operator: self.operator_stack.last().cloned(),
prior_mode, prior_mode,

1
crates/vim/src/state.rs
View file

@ -975,6 +975,7 @@ impl Clone for ReplayableAction {
pub struct SearchState { pub struct SearchState {
pub direction: Direction, pub direction: Direction,
pub count: usize, pub count: usize,
pub vim_mode_search: bool,
pub prior_selections: Vec<Range<Anchor>>, pub prior_selections: Vec<Range<Anchor>>,
pub prior_operator: Option<Operator>, pub prior_operator: Option<Operator>,

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

@ -332,8 +332,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()
}
}) })
}); });
}) })