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

Fix mouse selection

Browse source 
Co-Authored-By: WindSoilder <WindSoilder@outlook.com>
This commit is contained in:
Conrad Irwin 2024-02-02 16:36:51 -07:00
parent aeb8535468
commit ada0523043
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -204,7 +204,8 @@ impl Vim {
let editor = editor.read(cx); let editor = editor.read(cx);
if editor.leader_peer_id().is_none() { if editor.leader_peer_id().is_none() {
let newest = editor.selections.newest::<usize>(cx); let newest = editor.selections.newest::<usize>(cx);
local_selections_changed(newest, cx); let is_multicursor = editor.selections.count() > 1;
local_selections_changed(newest, is_multicursor, cx);
} }
} }
EditorEvent::InputIgnored { text } => { EditorEvent::InputIgnored { text } => {
@ -626,7 +627,11 @@ impl Settings for VimModeSetting {
} }
} }
fn local_selections_changed(newest: Selection<usize>, cx: &mut WindowContext) { fn local_selections_changed(
newest: Selection<usize>,
is_multicursor: bool,
cx: &mut WindowContext,
) {
Vim::update(cx, |vim, cx| { Vim::update(cx, |vim, cx| {
if vim.enabled { if vim.enabled {
if vim.state().mode == Mode::Normal && !newest.is_empty() { if vim.state().mode == Mode::Normal && !newest.is_empty() {
@ -636,6 +641,7 @@ fn local_selections_changed(newest: Selection<usize>, cx: &mut WindowContext) {
vim.switch_mode(Mode::Visual, false, cx) vim.switch_mode(Mode::Visual, false, cx)
} }
} else if newest.is_empty() } else if newest.is_empty()
&& !is_multicursor
&& [Mode::Visual, Mode::VisualLine, Mode::VisualBlock].contains(&vim.state().mode) && [Mode::Visual, Mode::VisualLine, Mode::VisualBlock].contains(&vim.state().mode)
{ {
vim.switch_mode(Mode::Normal, true, cx) vim.switch_mode(Mode::Normal, true, cx)