mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-24 02:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

vim: Fix inline completions not disappearing in normal mode (#23176)

Browse source 
Closes #23042

Release Notes:

- Fixed inline completions (Copilot, Supermaven, ...) still being
visible sometimes after leaving Vim's insert mode.
This commit is contained in:
Thorsten Ball 2025-01-15 13:44:56 +01:00 committed by GitHub
parent bd3f64c5a1
commit bf75b33464
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1732,8 +1732,12 @@ impl Editor {
self.input_enabled = input_enabled;
}
pub fn set_inline_completions_enabled(&mut self, enabled: bool) {
pub fn set_inline_completions_enabled(&mut self, enabled: bool, cx: &mut ViewContext<Self>) {
self.enable_inline_completions = enabled;
if !self.enable_inline_completions {
self.take_active_inline_completion(cx);
cx.notify();
}
}
pub fn set_autoindent(&mut self, autoindent: bool) {
@ -4785,6 +4789,7 @@ impl Editor {
|| (!self.completion_tasks.is_empty() && !self.has_active_inline_completion()));
if completions_menu_has_precedence
|| !offset_selection.is_empty()
|| !self.enable_inline_completions
|| self
.active_inline_completion
.as_ref()

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

@ -1240,7 +1240,7 @@ impl Vim {
.map_or(false, |provider| provider.show_completions_in_normal_mode()),
_ => false,
};
editor.set_inline_completions_enabled(enable_inline_completions);
editor.set_inline_completions_enabled(enable_inline_completions, cx);
});
cx.notify()
}