mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-27 04:44:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

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

@ -22,7 +22,7 @@ impl Vim {
if count <= 1 || Vim::globals(cx).dot_replaying {
self.create_mark("^".into(), false, 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| {
s.move_cursors_with(|map, mut cursor, _| {
*cursor.column_mut() = cursor.column().saturating_sub(1);