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

vim: Fix ignoring cursor_shape settings (#25439)

Browse source 
Closes #ISSUE

[Block cursor in insert mode
#25322](https://github.com/zed-industries/zed/discussions/25322)

Respect the `cursor_shape` setting in insert mode

Release Notes:

- Fixed vim ignoring `cursor_shape` settings
This commit is contained in:
0x2CA 2025-03-05 12:48:43 +08:00 • committed by GitHub
parent ec4719146a
commit 9c7eee24bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ use anyhow::Result;
use collections::HashMap; use collections::HashMap;
use editor::{ use editor::{
movement::{self, FindRange}, movement::{self, FindRange},
Anchor, Bias, Editor, EditorEvent, EditorMode, ToPoint, Anchor, Bias, Editor, EditorEvent, EditorMode, EditorSettings, ToPoint,
}; };
use gpui::{ use gpui::{
actions, impl_actions, Action, App, AppContext as _, Axis, Context, Entity, EventEmitter, actions, impl_actions, Action, App, AppContext as _, Axis, Context, Entity, EventEmitter,
@ -980,7 +980,7 @@ impl Vim {
count count
} }
pub fn cursor_shape(&self) -> CursorShape { pub fn cursor_shape(&self, cx: &mut App) -> CursorShape {
match self.mode { match self.mode {
Mode::Normal => { Mode::Normal => {
if let Some(operator) = self.operator_stack.last() { if let Some(operator) = self.operator_stack.last() {
@ -1006,7 +1006,10 @@ impl Vim {
Mode::HelixNormal | Mode::Visual | Mode::VisualLine | Mode::VisualBlock => { Mode::HelixNormal | Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
CursorShape::Block CursorShape::Block
} }
Mode::Insert => CursorShape::Bar, Mode::Insert => {
let editor_settings = EditorSettings::get_global(cx);
editor_settings.cursor_shape.unwrap_or_default()
}
} }
} }
@ -1145,7 +1148,7 @@ impl Vim {
self.store_visual_marks(window, cx); self.store_visual_marks(window, cx);
self.clear_operator(window, cx); self.clear_operator(window, cx);
self.update_editor(window, cx, |vim, editor, _, cx| { self.update_editor(window, cx, |vim, editor, _, cx| {
if vim.cursor_shape() == CursorShape::Block { if vim.cursor_shape(cx) == CursorShape::Block {
editor.set_cursor_shape(CursorShape::Hollow, cx); editor.set_cursor_shape(CursorShape::Hollow, cx);
} }
}); });
@ -1153,7 +1156,7 @@ impl Vim {
fn cursor_shape_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) { fn cursor_shape_changed(&mut self, window: &mut Window, cx: &mut Context<Self>) {
self.update_editor(window, cx, |vim, editor, _, cx| { self.update_editor(window, cx, |vim, editor, _, cx| {
editor.set_cursor_shape(vim.cursor_shape(), cx); editor.set_cursor_shape(vim.cursor_shape(cx), cx);
}); });
} }
@ -1618,7 +1621,7 @@ impl Vim {
fn sync_vim_settings(&mut self, window: &mut Window, cx: &mut Context<Self>) { fn sync_vim_settings(&mut self, window: &mut Window, cx: &mut Context<Self>) {
self.update_editor(window, cx, |vim, editor, window, cx| { self.update_editor(window, cx, |vim, editor, window, cx| {
editor.set_cursor_shape(vim.cursor_shape(), cx); editor.set_cursor_shape(vim.cursor_shape(cx), cx);
editor.set_clip_at_line_ends(vim.clip_at_line_ends(), cx); editor.set_clip_at_line_ends(vim.clip_at_line_ends(), cx);
editor.set_collapse_matches(true); editor.set_collapse_matches(true);
editor.set_input_enabled(vim.editor_input_enabled()); editor.set_input_enabled(vim.editor_input_enabled());