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

disable vim mode in non full editors

Browse source
This commit is contained in:
Kay Simmons 2023-01-17 17:32:10 -08:00
parent 4746fb5936
commit c3518cefe8
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,9 +37,7 @@ fn editor_focused(EditorFocused(editor): &EditorFocused, cx: &mut MutableAppCont
let editor_mode = editor.mode(); let editor_mode = editor.mode();
let newest_selection_empty = editor.selections.newest::<usize>(cx).is_empty(); let newest_selection_empty = editor.selections.newest::<usize>(cx).is_empty();
if editor_mode != EditorMode::Full { if editor_mode == EditorMode::Full && !newest_selection_empty {
vim.switch_mode(Mode::Insert, true, cx);
} else if !newest_selection_empty {
vim.switch_mode(Mode::Visual { line: false }, true, cx); vim.switch_mode(Mode::Visual { line: false }, true, cx);
} }
}); });

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

@ -12,7 +12,7 @@ mod visual;
use collections::HashMap; use collections::HashMap;
use command_palette::CommandPaletteFilter; use command_palette::CommandPaletteFilter;
use editor::{Bias, Cancel, Editor}; use editor::{Bias, Cancel, Editor, EditorMode};
use gpui::{ use gpui::{
impl_actions, impl_actions,
keymap_matcher::{KeyPressed, Keystroke}, keymap_matcher::{KeyPressed, Keystroke},
@ -267,7 +267,7 @@ impl Vim {
for editor in self.editors.values() { for editor in self.editors.values() {
if let Some(editor) = editor.upgrade(cx) { if let Some(editor) = editor.upgrade(cx) {
editor.update(cx, |editor, cx| { editor.update(cx, |editor, cx| {
if self.enabled { if self.enabled && editor.mode() == EditorMode::Full {
editor.set_cursor_shape(cursor_shape, cx); editor.set_cursor_shape(cursor_shape, cx);
editor.set_clip_at_line_ends(state.clip_at_line_end(), cx); editor.set_clip_at_line_ends(state.clip_at_line_end(), cx);
editor.set_input_enabled(!state.vim_controlled()); editor.set_input_enabled(!state.vim_controlled());