From aa00a470f31514b792e219513ffb3806a5e5b53e Mon Sep 17 00:00:00 2001
From: Joe
Date: Tue, 20 Sep 2022 03:40:48 -0400
Subject: Fix preview bug (#3644)

* Fix preview bug

* Add comment to empty case---
 helix-term/src/commands/typed.rs | 5 ++++-
 helix-term/src/ui/prompt.rs      | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index c22f8712..f49fff30 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -715,7 +715,10 @@ fn theme(
             cx.editor.unset_theme_preview();
         }
         PromptEvent::Update => {
-            if let Some(theme_name) = args.first() {
+            if args.is_empty() {
+                // Ensures that a preview theme gets cleaned up if the user backspaces until the prompt is empty.
+                cx.editor.unset_theme_preview();
+            } else if let Some(theme_name) = args.first() {
                 if let Ok(theme) = cx.editor.theme_loader.load(theme_name) {
                     if !(true_color || theme.is_16_color()) {
                         bail!("Unsupported theme: theme requires true color support");
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index d66e32be..db3bd62d 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -293,6 +293,7 @@ impl Prompt {
         register: char,
         direction: CompletionDirection,
     ) {
+        (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
         let register = cx.editor.registers.get_mut(register).read();
 
         if register.is_empty() {
@@ -314,6 +315,7 @@ impl Prompt {
         self.history_pos = Some(index);
 
         self.move_end();
+        (self.callback_fn)(cx, &self.line, PromptEvent::Update);
         self.recalculate_completion(cx.editor);
     }
 
@@ -564,13 +566,11 @@ impl Component for Prompt {
             ctrl!('p') | key!(Up) => {
                 if let Some(register) = self.history_register {
                     self.change_history(cx, register, CompletionDirection::Backward);
-                    (self.callback_fn)(cx, &self.line, PromptEvent::Update);
                 }
             }
             ctrl!('n') | key!(Down) => {
                 if let Some(register) = self.history_register {
                     self.change_history(cx, register, CompletionDirection::Forward);
-                    (self.callback_fn)(cx, &self.line, PromptEvent::Update);
                 }
             }
             key!(Tab) => {
-- 
cgit v1.2.3-70-g09d2