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

Revert "vim: Don't dismiss inline completion when switching to normal mode (#22075)" (#22131)

Browse source 
This reverts commit 38c0aa303e from
#22075.

Release Notes:

- N/A
This commit is contained in:
Thorsten Ball 2024-12-17 09:24:33 +01:00 • committed by GitHub
parent ebf6804afd
commit 9082a006d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/editor/src/editor.rs
View file

@ -2427,7 +2427,7 @@ impl Editor {
cx.notify(); cx.notify();
return; return;
} }
if self.dismiss_menus_and_popups(false, true, cx) { if self.dismiss_menus_and_popups(true, cx) {
return; return;
} }
@ -2442,7 +2442,6 @@ impl Editor {
pub fn dismiss_menus_and_popups( pub fn dismiss_menus_and_popups(
&mut self, &mut self,
keep_inline_completion: bool,
should_report_inline_completion_event: bool, should_report_inline_completion_event: bool,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> bool { ) -> bool {
@ -2466,9 +2465,7 @@ impl Editor {
return true; return true;
} }
if !keep_inline_completion if self.discard_inline_completion(should_report_inline_completion_event, cx) {
&& self.discard_inline_completion(should_report_inline_completion_event, cx)
{
return true; return true;
} }

2
crates/vim/src/insert.rs
View file

@ -22,7 +22,7 @@ impl Vim {
if count <= 1 || Vim::globals(cx).dot_replaying { if count <= 1 || Vim::globals(cx).dot_replaying {
self.create_mark("^".into(), false, cx); self.create_mark("^".into(), false, cx);
self.update_editor(cx, |_, editor, cx| { self.update_editor(cx, |_, editor, cx| {
editor.dismiss_menus_and_popups(true, false, cx); editor.dismiss_menus_and_popups(false, cx);
editor.change_selections(Some(Autoscroll::fit()), cx, |s| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
s.move_cursors_with(|map, mut cursor, _| { s.move_cursors_with(|map, mut cursor, _| {
*cursor.column_mut() = cursor.column().saturating_sub(1); *cursor.column_mut() = cursor.column().saturating_sub(1);