Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-14 14:52:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove invalid suggestion on using subcommand after positional argument

Browse source
This commit is contained in:
Donough Liu 2020-11-07 20:32:28 +08:00
parent 2b1f47f975
commit 5e4b4f4196
2 changed files with 68 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
src/parse/parser.rs
View file

@ -490,31 +490,6 @@ impl<'help, 'app> Parser<'help, 'app> {
// get the next value from the iterator // get the next value from the iterator
continue; continue;
} }
if !(self.is_set(AS::ArgsNegateSubcommands) && self.is_set(AS::ValidArgFound)
|| self.is_set(AS::AllowExternalSubcommands)
|| self.is_set(AS::InferSubcommands))
{
let cands = suggestions::did_you_mean(
&*arg_os.to_string_lossy(),
self.app.all_subcommand_names(),
);
if !cands.is_empty() {
let cands: Vec<_> =
cands.iter().map(|cand| format!("'{}'", cand)).collect();
return Err(ClapError::invalid_subcommand(
arg_os.to_string_lossy().to_string(),
cands.join(" or "),
self.app
.bin_name
.as_ref()
.unwrap_or(&self.app.name)
.to_string(),
Usage::new(self).create_usage_with_title(&[]),
self.app.color(),
));
}
}
} }
let positional_count = self let positional_count = self
@ -672,54 +647,55 @@ impl<'help, 'app> Parser<'help, 'app> {
external_subcommand = true; external_subcommand = true;
break; break;
} else if !self.has_args()
|| self.is_set(AS::InferSubcommands) && self.has_subcommands()
{
let cands = suggestions::did_you_mean(
&*arg_os.to_string_lossy(),
self.app.all_subcommand_names(),
);
if !cands.is_empty() {
let cands: Vec<_> = cands.iter().map(|cand| format!("'{}'", cand)).collect();
return Err(ClapError::invalid_subcommand(
arg_os.to_string_lossy().to_string(),
cands.join(" or "),
self.app
.bin_name
.as_ref()
.unwrap_or(&self.app.name)
.to_string(),
Usage::new(self).create_usage_with_title(&[]),
self.app.color(),
));
} else {
return Err(ClapError::unrecognized_subcommand(
arg_os.to_string_lossy().to_string(),
self.app
.bin_name
.as_ref()
.unwrap_or(&self.app.name)
.to_string(),
self.app.color(),
));
}
} else if self.is_set(AS::TrailingValues) {
// If argument followed by a `--`
if self.possible_subcommand(&arg_os).is_some() {
return Err(ClapError::unnecessary_double_dash(
arg_os.to_string_lossy().to_string(),
Usage::new(self).create_usage_with_title(&[]),
self.app.color(),
));
} else {
return Err(ClapError::unknown_argument(
arg_os.to_string_lossy().to_string(),
None,
Usage::new(self).create_usage_with_title(&[]),
self.app.color(),
));
}
} else { } else {
// Start error processing
// If argument follows a `--`
if self.is_set(AS::TrailingValues) {
// If the arg matches a subcommand name, or any of its aliases (if defined)
if self.possible_subcommand(&arg_os).is_some() {
return Err(ClapError::unnecessary_double_dash(
arg_os.to_string_lossy().to_string(),
Usage::new(self).create_usage_with_title(&[]),
self.app.color(),
));
}
} else {
let cands = suggestions::did_you_mean(
&arg_os.to_string_lossy(),
self.app.all_subcommand_names(),
);
// If the argument looks like a subcommand.
if !cands.is_empty() {
let cands: Vec<_> =
cands.iter().map(|cand| format!("'{}'", cand)).collect();
return Err(ClapError::invalid_subcommand(
arg_os.to_string_lossy().to_string(),
cands.join(" or "),
self.app
.bin_name
.as_ref()
.unwrap_or(&self.app.name)
.to_string(),
Usage::new(self).create_usage_with_title(&[]),
self.app.color(),
));
}
// If the argument must be a subcommand.
if !self.has_args()
|| self.is_set(AS::InferSubcommands) && self.has_subcommands()
{
return Err(ClapError::unrecognized_subcommand(
arg_os.to_string_lossy().to_string(),
self.app
.bin_name
.as_ref()
.unwrap_or(&self.app.name)
.to_string(),
self.app.color(),
));
}
}
return Err(ClapError::unknown_argument( return Err(ClapError::unknown_argument(
arg_os.to_string_lossy().to_string(), arg_os.to_string_lossy().to_string(),
None, None,

20
tests/subcommands.rs
View file

@ -433,3 +433,23 @@ fn subcommand_used_after_double_dash() {
true true
)); ));
} }
#[test]
fn subcommand_after_argument() {
let m = App::new("myprog")
.arg(Arg::new("some_text"))
.subcommand(App::new("test"))
.get_matches_from(vec!["myprog", "teat", "test"]);
assert_eq!(m.value_of("some_text"), Some("teat"));
assert_eq!(m.subcommand().unwrap().0, "test");
}
#[test]
fn subcommand_after_argument_looks_like_help() {
let m = App::new("myprog")
.arg(Arg::new("some_text"))
.subcommand(App::new("test"))
.get_matches_from(vec!["myprog", "helt", "test"]);
assert_eq!(m.value_of("some_text"), Some("helt"));
assert_eq!(m.subcommand().unwrap().0, "test");
}