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

vim: Don't enter visual mode in search/go to definition

Browse source 
Fixes: zed-industries/community#1514
Contributes: zed-industries/community#1284
This commit is contained in:
Conrad Irwin 2023-06-28 11:47:14 -06:00
parent 75fe77c11d
commit 2ffce24ef0
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -295,11 +295,15 @@ impl Vim {
if self.enabled && editor.mode() == EditorMode::Full {
editor.set_cursor_shape(cursor_shape, cx);
editor.set_clip_at_line_ends(state.clip_at_line_end(), cx);
editor.set_collapse_matches(true);
editor.set_input_enabled(!state.vim_controlled());
editor.selections.line_mode = matches!(state.mode, Mode::Visual { line: true });
let context_layer = state.keymap_context_layer();
editor.set_keymap_context_layer::<Self>(context_layer, cx);
} else {
// Note: set_collapse_matches is not in unhook_vim_settings, as that method is called on blur,
// but we need collapse_matches to persist when the search bar is focused.
editor.set_collapse_matches(false);
Self::unhook_vim_settings(editor, cx);
}
});