Merge pull request console-rs#73 from edwardwli/master

Author: pksunkara

examples/confirm.rs

@@ -0,0 +1,30 @@
+extern crate dialoguer;
+
+use dialoguer::Confirm;
+
+fn main() {
+    println!("disable default");
+    if Confirm::new()
+        .with_prompt("continue?")
+        .disable_default(true)
+        .interact()
+        .unwrap()
+    {
+        println!("continuing");
+    } else {
+        println!("exiting");
+    }
+
+    println!();
+
+    println!("enable default");
+    if Confirm::new()
+        .with_prompt("continue?")
+        .interact()
+        .unwrap()
+    {
+        println!("continuing");
+    } else {
+        println!("exiting");
+    }
+}

src/prompts/confirm.rs

@@ -23,6 +23,7 @@ pub struct Confirm<'a> {
     prompt: String,
     default: bool,
     show_default: bool,
+    disable_default: bool,
     wait_for_newline: bool,
     theme: &'a dyn Theme,
 }
@@ -60,6 +61,7 @@ impl<'a> Confirm<'a> {
             prompt: "".into(),
             default: true,
             show_default: true,
+            disable_default: false,
             wait_for_newline: false,
             theme,
         }
@@ -109,6 +111,16 @@ impl<'a> Confirm<'a> {
         self
     }
 
+    /// Select whether the user must explicitly confirm their selection.
+    ///
+    /// When `false` (default), the user can input a newline to select the default.
+    ///
+    /// When `true`, the user must input a letter - a newline will do nothing.
+    pub fn disable_default(&mut self, val: bool) -> &mut Confirm<'a> {
+        self.disable_default = val;
+        self
+    }
+
     /// Enables user interaction and returns the result.
     ///
     /// If the user confirms the result is `true`, `false` if declines or default (configured in [default](#method.default)) if pushes enter.
@@ -156,7 +168,7 @@ impl<'a> Confirm<'a> {
                 let rv = match &*input_buf.trim_end().to_lowercase() {
                     "y" | "yes" => true,
                     "n" | "no" => false,
-                    "" => self.default,
+                    "" if !self.disable_default => self.default,
                     _ => {
                         // On invalid input re-render the user prompt.
                         render.confirm_prompt(&self.prompt, default)?;
@@ -178,7 +190,7 @@ impl<'a> Confirm<'a> {
                 let rv = match input {
                     'y' | 'Y' => true,
                     'n' | 'N' => false,
-                    '\n' | '\r' => self.default,
+                    '\n' | '\r' if !self.disable_default => self.default,
                     _ => {
                         continue;
                     }