From fe9f732c5f8a7484a4a3610abcc59a66fbfa9a9d Mon Sep 17 00:00:00 2001
From: Antoine Stevan <44101798+amtoine@users.noreply.github.com>
Date: Mon, 8 May 2023 19:45:55 +0200
Subject: [PATCH] REFACTOR: make `input list` a tiny bit tighter (#9115)

related to #8963
cc/ @melMass

# Description
just a little refactoring attempt for `input list` :relieved:

i wanted to refactor even more, but `Select`, `MultiSelect` and
`FuzzySelect` do not share a common trait, i could not find a nice way
to reduce the big `if` block...

# User-Facing Changes
```
$nothing
```

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :black_circle: `toolkit test`
- :black_circle: `toolkit test stdlib`

# After Submitting
```
$nothing
```
---
 crates/nu-command/src/platform/input/list.rs | 82 +++++++++-----------
 1 file changed, 38 insertions(+), 44 deletions(-)

diff --git a/crates/nu-command/src/platform/input/list.rs b/crates/nu-command/src/platform/input/list.rs
index 8cc39600af..1b54f2d2e7 100644
--- a/crates/nu-command/src/platform/input/list.rs
+++ b/crates/nu-command/src/platform/input/list.rs
@@ -127,6 +127,13 @@ impl Command for InputList {
             });
         }
 
+        if call.has_flag("multi") && call.has_flag("fuzzy") {
+            return Err(ShellError::TypeMismatch {
+                err_message: "Fuzzy search is not supported for multi select".to_string(),
+                span: head,
+            });
+        }
+
         // could potentially be used to map the use theme colors at some point
         // let theme = dialoguer::theme::ColorfulTheme {
         //     active_item_style: Style::new().fg(Color::Cyan).bold(),
@@ -134,26 +141,19 @@ impl Command for InputList {
         // };
 
         let ans: InteractMode = if call.has_flag("multi") {
-            if call.has_flag("fuzzy") {
-                return Err(ShellError::TypeMismatch {
-                    err_message: "Fuzzy search is not supported for multi select".to_string(),
-                    span: head,
-                });
-            } else {
-                let mut multi_select = MultiSelect::new(); //::with_theme(&theme);
+            let mut multi_select = MultiSelect::new(); //::with_theme(&theme);
 
-                InteractMode::Multi(
-                    if !prompt.is_empty() {
-                        multi_select.with_prompt(&prompt)
-                    } else {
-                        &mut multi_select
-                    }
-                    .items(&options)
-                    .report(false)
-                    .interact_on_opt(&Term::stderr())
-                    .map_err(|err| ShellError::IOError(format!("{}: {}", INTERACT_ERROR, err)))?,
-                )
-            }
+            InteractMode::Multi(
+                if !prompt.is_empty() {
+                    multi_select.with_prompt(&prompt)
+                } else {
+                    &mut multi_select
+                }
+                .items(&options)
+                .report(false)
+                .interact_on_opt(&Term::stderr())
+                .map_err(|err| ShellError::IOError(format!("{}: {}", INTERACT_ERROR, err)))?,
+            )
         } else if call.has_flag("fuzzy") {
             let mut fuzzy_select = FuzzySelect::new(); //::with_theme(&theme);
 
@@ -185,32 +185,26 @@ impl Command for InputList {
             )
         };
 
-        match ans {
-            InteractMode::Multi(res) => Ok({
-                match res {
-                    Some(opts) => Value::List {
-                        vals: opts.iter().map(|s| options[*s].value.clone()).collect(),
-                        span: head,
-                    },
-                    None => Value::List {
-                        vals: vec![],
-                        span: head,
-                    },
-                }
-            }
-            .into_pipeline_data()),
-            InteractMode::Single(res) => Ok({
-                match res {
-                    Some(opt) => options[opt].value.clone(),
-
-                    None => Value::String {
-                        val: "".to_string(),
-                        span: head,
-                    },
-                }
-            }
-            .into_pipeline_data()),
+        Ok(match ans {
+            InteractMode::Multi(res) => match res {
+                Some(opts) => Value::List {
+                    vals: opts.iter().map(|s| options[*s].value.clone()).collect(),
+                    span: head,
+                },
+                None => Value::List {
+                    vals: vec![],
+                    span: head,
+                },
+            },
+            InteractMode::Single(res) => match res {
+                Some(opt) => options[opt].value.clone(),
+                None => Value::String {
+                    val: "".to_string(),
+                    span: head,
+                },
+            },
         }
+        .into_pipeline_data())
     }
 
     fn examples(&self) -> Vec<Example> {