diff options
author | Michael Davis | 2023-02-16 01:15:25 +0000 |
---|---|---|
committer | GitHub | 2023-02-16 01:15:25 +0000 |
commit | d8526a752c52e73f041f76869c0e040959632927 (patch) | |
tree | 29464f1cccc4081b14d28626cd7a48ca73c10986 | |
parent | 4c85f4d151b8cf3f548d2c35ab6d2eaebe328283 (diff) |
Use Popup::ignore_escape_key helper for completion (#6006)
The completion component has a separate branch for handling the
Escape key but it can use the `ignore_escape_key` helper added for
signature-help instead.
This should not cause a behavior change - it's just cleaning up the
completion component.
-rw-r--r-- | helix-term/src/ui/completion.rs | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs index 3e2f2aea..a24da20a 100644 --- a/helix-term/src/ui/completion.rs +++ b/helix-term/src/ui/completion.rs @@ -9,11 +9,7 @@ use tui::{buffer::Buffer as Surface, text::Span}; use std::borrow::Cow; use helix_core::{Change, Transaction}; -use helix_view::{ - graphics::Rect, - input::{KeyCode, KeyEvent}, - Document, Editor, -}; +use helix_view::{graphics::Rect, Document, Editor}; use crate::commands; use crate::ui::{menu, Markdown, Menu, Popup, PromptEvent}; @@ -254,7 +250,9 @@ impl Completion { } }; }); - let popup = Popup::new(Self::ID, menu).with_scrollbar(false); + let popup = Popup::new(Self::ID, menu) + .with_scrollbar(false) + .ignore_escape_key(true); let mut completion = Self { popup, start_offset, @@ -378,13 +376,6 @@ impl Completion { impl Component for Completion { fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult { - // let the Editor handle Esc instead - if let Event::Key(KeyEvent { - code: KeyCode::Esc, .. - }) = event - { - return EventResult::Ignored(None); - } self.popup.handle_event(event, cx) } |