mirror of
https://github.com/clap-rs/clap
synced 2024-12-14 06:42:33 +00:00
Merge pull request #2329 from ldm0/dash
Fix eagerly trimming dash in parse_long_flag
This commit is contained in:
commit
440cee8ff5
2 changed files with 23 additions and 1 deletions
|
@ -1007,7 +1007,7 @@ impl<'help, 'app> Parser<'help, 'app> {
|
||||||
self.cur_idx.set(self.cur_idx.get() + 1);
|
self.cur_idx.set(self.cur_idx.get() + 1);
|
||||||
|
|
||||||
debug!("Parser::parse_long_arg: Does it contain '='...");
|
debug!("Parser::parse_long_arg: Does it contain '='...");
|
||||||
let long_arg = full_arg.trim_start_matches(b'-');
|
let long_arg = full_arg.trim_start_n_matches(2, b'-');
|
||||||
let (arg, val) = if full_arg.contains_byte(b'=') {
|
let (arg, val) = if full_arg.contains_byte(b'=') {
|
||||||
let (p0, p1) = long_arg.split_at_byte(b'=');
|
let (p0, p1) = long_arg.split_at_byte(b'=');
|
||||||
debug!("Yes '{:?}'", p1);
|
debug!("Yes '{:?}'", p1);
|
||||||
|
@ -1473,6 +1473,7 @@ impl<'help, 'app> Parser<'help, 'app> {
|
||||||
|
|
||||||
// Error, Help, and Version Methods
|
// Error, Help, and Version Methods
|
||||||
impl<'help, 'app> Parser<'help, 'app> {
|
impl<'help, 'app> Parser<'help, 'app> {
|
||||||
|
/// Is only used for the long flag(which is the only one needs fuzzy searching)
|
||||||
fn did_you_mean_error(
|
fn did_you_mean_error(
|
||||||
&mut self,
|
&mut self,
|
||||||
arg: &str,
|
arg: &str,
|
||||||
|
|
|
@ -146,3 +146,24 @@ fn issue_1284_argument_in_flag_style() {
|
||||||
true
|
true
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn issue_2308_multiple_dashes() {
|
||||||
|
static MULTIPLE_DASHES: &str =
|
||||||
|
"error: Found argument '-----' which wasn't expected, or isn't valid in this context
|
||||||
|
|
||||||
|
If you tried to supply `-----` as a value rather than a flag, use `-- -----`
|
||||||
|
|
||||||
|
USAGE:
|
||||||
|
test <arg>
|
||||||
|
|
||||||
|
For more information try --help";
|
||||||
|
let app = App::new("test").arg(Arg::new("arg").takes_value(true).required(true));
|
||||||
|
|
||||||
|
assert!(utils::compare_output(
|
||||||
|
app,
|
||||||
|
"test -----",
|
||||||
|
MULTIPLE_DASHES,
|
||||||
|
true
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue