Restore document state on completion cancel (#2096)

helix-editor · Apr 20, 2022 · 3a7bf1c · 3a7bf1c
1 parent cc68fa8
commit 3a7bf1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
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 => {

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)