Restore document state on completion cancel

helix-editor · Apr 13, 2022 · 9f0e78b · 9f0e78b
1 parent 764adbd
commit 9f0e78b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
@@ -135,6 +135,7 @@ impl Completion {
 
             match event {
                 PromptEvent::Abort => {
+                    doc.restore(view.id);
                     editor.last_completion = None;
                 }
                 PromptEvent::Update => {
@@ -282,13 +283,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)
     }
 

diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
@@ -124,7 +124,10 @@ impl<T: Component> Component for Popup<T> {
 
         match key.into() {
             // esc or ctrl-c aborts the completion and closes the menu
-            key!(Esc) | ctrl!('c') => EventResult::Consumed(Some(close_fn)),
+            key!(Esc) | ctrl!('c') => {
+                let _ = self.contents.handle_event(event, cx);
+                EventResult::Consumed(Some(close_fn))
+            }
             ctrl!('d') => {
                 self.scroll(self.size.1 as usize / 2, true);
                 EventResult::Consumed(None)