RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

Merge pull request #5127 from cakebaker/uucore_fix_shortcut_value_parser

Browse source 
uucore: don't show error for ambiguous value
This commit is contained in:
Terts Diepraam 2023-08-11 11:16:30 +02:00 • committed by GitHub
commit 0a4f833bb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/uucore/src/lib/parser/shortcut_value_parser.rs
View file

@ -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() {