refactor: address PR review feedback for show_hint

Author: opmr0

examples/no_hint.rs

@@ -172,7 +172,12 @@ impl Confirm<'_> {
             None
         };
 
-        render.confirm_prompt(&self.prompt, default_if_show, self.show_hint)?;
+        term.clear_line()?;
+        if self.show_hint {
+            render.confirm_prompt(&self.prompt, default_if_show)?;
+        } else {
+            term.write_str(&format!("{} ", &self.prompt))?;
+        }
 
         term.hide_cursor()?;
         term.flush()?;
@@ -214,7 +219,7 @@ impl Confirm<'_> {
                 };
 
                 term.clear_line()?;
-                render.confirm_prompt(&self.prompt, value, self.show_hint)?;
+                render.confirm_prompt(&self.prompt, value)?;
             }
         } else {
             // Default behavior: matches continuously on every keystroke,

src/prompts/confirm.rs

@@ -139,7 +139,6 @@ impl Theme for ColorfulTheme {
         f: &mut dyn fmt::Write,
         prompt: &str,
         default: Option<bool>,
-        show_hint: bool,
     ) -> fmt::Result {
         if !prompt.is_empty() {
             write!(
@@ -150,31 +149,27 @@ impl Theme for ColorfulTheme {
             )?;
         }
 
-        if show_hint {
-            match default {
-                None => write!(
-                    f,
-                    "{} {}",
-                    self.hint_style.apply_to("(y/n)"),
-                    &self.prompt_suffix
-                ),
-                Some(true) => write!(
-                    f,
-                    "{} {} {}",
-                    self.hint_style.apply_to("(y/n)"),
-                    &self.prompt_suffix,
-                    self.defaults_style.apply_to("yes")
-                ),
-                Some(false) => write!(
-                    f,
-                    "{} {} {}",
-                    self.hint_style.apply_to("(y/n)"),
-                    &self.prompt_suffix,
-                    self.defaults_style.apply_to("no")
-                ),
-            }
-        } else {
-            Ok(())
+        match default {
+            None => write!(
+                f,
+                "{} {}",
+                self.hint_style.apply_to("(y/n)"),
+                &self.prompt_suffix
+            ),
+            Some(true) => write!(
+                f,
+                "{} {} {}",
+                self.hint_style.apply_to("(y/n)"),
+                &self.prompt_suffix,
+                self.defaults_style.apply_to("yes")
+            ),
+            Some(false) => write!(
+                f,
+                "{} {} {}",
+                self.hint_style.apply_to("(y/n)"),
+                &self.prompt_suffix,
+                self.defaults_style.apply_to("no")
+            ),
         }
     }
     /// Formats a confirm prompt after selection.

src/theme/colorful.rs

@@ -33,17 +33,14 @@ pub trait Theme {
         f: &mut dyn fmt::Write,
         prompt: &str,
         default: Option<bool>,
-        show_hint: bool,
     ) -> fmt::Result {
         if !prompt.is_empty() {
             write!(f, "{} ", &prompt)?;
         }
-        if show_hint {
-            match default {
-                None => write!(f, "[y/n] ")?,
-                Some(true) => write!(f, "[Y/n] ")?,
-                Some(false) => write!(f, "[y/N] ")?,
-            }
+        match default {
+            None => write!(f, "[y/n] ")?,
+            Some(true) => write!(f, "[Y/n] ")?,
+            Some(false) => write!(f, "[y/N] ")?,
         }
         Ok(())
     }

src/theme/mod.rs

@@ -87,16 +87,8 @@ impl<'a> TermThemeRenderer<'a> {
         self.write_formatted_line(|this, buf| this.theme.format_error(buf, err))
     }
 
-    pub fn confirm_prompt(
-        &mut self,
-        prompt: &str,
-        default: Option<bool>,
-        show_hint: bool,
-    ) -> Result<usize> {
-        self.write_formatted_str(|this, buf| {
-            this.theme
-                .format_confirm_prompt(buf, prompt, default, show_hint)
-        })
+    pub fn confirm_prompt(&mut self, prompt: &str, default: Option<bool>) -> Result<usize> {
+        self.write_formatted_str(|this, buf| this.theme.format_confirm_prompt(buf, prompt, default))
     }
 
     pub fn confirm_prompt_selection(&mut self, prompt: &str, sel: Option<bool>) -> Result {