Merge pull request #5127 from cakebaker/uucore_fix_shortcut_value_parser

uucore: don't show error for ambiguous value
uutils · Aug 11, 2023 · 0a4f833 · 0a4f833
2 parents 8f5899b + ec27a07
commit 0a4f833
Showing 1 changed file with 46 additions and 22 deletions.
diff --git a/src/uucore/src/lib/parser/shortcut_value_parser.rs b/src/uucore/src/lib/parser/shortcut_value_parser.rs
@@ -1,3 +1,4 @@
+// spell-checker:ignore abcdefgh
 use clap::{
     builder::{PossibleValue, TypedValueParser},
     error::{ContextKind, ContextValue, ErrorKind},
@@ -15,6 +16,34 @@ impl ShortcutValueParser {
     pub fn new(values: impl Into<Self>) -> Self {
         values.into()
     }
+
+    fn generate_clap_error(
+        &self,
+        cmd: &clap::Command,
+        arg: Option<&clap::Arg>,
+        value: &str,
+    ) -> clap::Error {
+        let mut err = clap::Error::new(ErrorKind::InvalidValue).with_cmd(cmd);
+
+        if let Some(arg) = arg {
+            err.insert(
+                ContextKind::InvalidArg,
+                ContextValue::String(arg.to_string()),
+            );
+        }
+
+        err.insert(
+            ContextKind::InvalidValue,
+            ContextValue::String(value.to_string()),
+        );
+
+        err.insert(
+            ContextKind::ValidValue,
+            ContextValue::Strings(self.0.iter().map(|x| x.get_name().to_string()).collect()),
+        );
+
+        err
+    }
 }
 
 impl TypedValueParser for ShortcutValueParser {
@@ -36,29 +65,16 @@ impl TypedValueParser for ShortcutValueParser {
             .filter(|x| x.get_name().starts_with(value))
             .collect();
 
-        if matched_values.len() == 1 {
-            Ok(matched_values[0].get_name().to_string())
-        } else {
-            let mut err = clap::Error::new(ErrorKind::InvalidValue).with_cmd(cmd);
-
-            if let Some(arg) = arg {
-                err.insert(
-                    ContextKind::InvalidArg,
-                    ContextValue::String(arg.to_string()),
-                );
+        match matched_values.len() {
+            0 => Err(self.generate_clap_error(cmd, arg, value)),
+            1 => Ok(matched_values[0].get_name().to_string()),
+            _ => {
+                if let Some(direct_match) = matched_values.iter().find(|x| x.get_name() == value) {
+                    Ok(direct_match.get_name().to_string())
+                } else {
+                    Err(self.generate_clap_error(cmd, arg, value))
+                }
             }
-
-            err.insert(
-                ContextKind::InvalidValue,
-                ContextValue::String(value.to_string()),
-            );
-
-            err.insert(
-                ContextKind::ValidValue,
-                ContextValue::Strings(self.0.iter().map(|x| x.get_name().to_string()).collect()),
-            );
-
-            Err(err)
         }
     }
 
@@ -127,6 +143,14 @@ mod tests {
         assert_eq!("abef", result.unwrap());
     }
 
+    #[test]
+    fn test_parse_ref_with_ambiguous_value_that_is_a_possible_value() {
+        let cmd = Command::new("cmd");
+        let parser = ShortcutValueParser::new(["abcd", "abcdefgh"]);
+        let result = parser.parse_ref(&cmd, None, OsStr::new("abcd"));
+        assert_eq!("abcd", result.unwrap());
+    }
+
     #[test]
     #[cfg(unix)]
     fn test_parse_ref_with_invalid_utf8() {