fix: doesn't include the various [ARGS] [FLAGS] or [OPTIONS] if the o…

…nly ones available are hidden Closes #882
clap-rs · Mar 4, 2017 · 7b4000a · 7b4000a
1 parent 8f0884c
commit 7b4000a
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/app/parser.rs b/src/app/parser.rs
@@ -472,7 +472,8 @@ impl<'a, 'b> Parser<'a, 'b>
     pub fn get_args_tag(&self) -> Option<String> {
         debugln!("Parser::get_args_tag;");
         let mut count = 0;
-        'outer: for p in self.positionals.values().filter(|p| !p.is_set(ArgSettings::Required)) {
+        'outer: for p in self.positionals.values().filter(|p| !p.is_set(ArgSettings::Required) && 
+            !p.is_set(ArgSettings::Hidden)) {
             debugln!("Parser::get_args_tag:iter:{}:", p.b.name);
             if let Some(g_vec) = self.groups_for_arg(p.b.name) {
                 for grp_s in &g_vec {
@@ -484,20 +485,21 @@ impl<'a, 'b> Parser<'a, 'b>
                 }
             }
             count += 1;
-            debugln!("Parser::get_args_tag:iter: {} Args not required", count);
+            debugln!("Parser::get_args_tag:iter: {} Args not required or hidden", count);
         }
-        if !self.is_set(AS::DontCollapseArgsInUsage) && (count > 1 || self.positionals.len() > 1) {
+        if !self.is_set(AS::DontCollapseArgsInUsage) && count > 1 {
             return None; // [ARGS]
         } else if count == 1 {
             let p = self.positionals
                 .values()
-                .find(|p| !p.is_set(ArgSettings::Required))
+                .find(|p| !p.is_set(ArgSettings::Required) && !p.is_set(ArgSettings::Hidden))
                 .expect(INTERNAL_ERROR_MSG);
             return Some(format!(" [{}]{}", p.name_no_brackets(), p.multiple_str()));
         } else if self.is_set(AS::DontCollapseArgsInUsage) && !self.positionals.is_empty() {
             return Some(self.positionals
                 .values()
                 .filter(|p| !p.is_set(ArgSettings::Required))
+                .filter(|p| !p.is_set(ArgSettings::Hidden))
                 .map(|p| format!(" [{}]{}", p.name_no_brackets(), p.multiple_str()))
                 .collect::<Vec<_>>()
                 .join(""));
@@ -525,6 +527,9 @@ impl<'a, 'b> Parser<'a, 'b>
                     }
                 }
             }
+            if f.is_set(ArgSettings::Hidden) {
+                continue;
+            }
             debugln!("Parser::needs_flags_tag:iter: [FLAGS] required");
             return true;
         }
@@ -2111,7 +2116,8 @@ impl<'a, 'b> Parser<'a, 'b>
                 usage.push_str(" [OPTIONS]");
             }
             if !self.is_set(AS::UnifiedHelpMessage) && self.has_opts() &&
-               self.opts.iter().any(|o| !o.b.settings.is_set(ArgSettings::Required)) {
+               self.opts.iter().any(|o| !o.is_set(ArgSettings::Required) && 
+               !o.is_set!(AS::Hidden)) {
                 usage.push_str(" [OPTIONS]");
             }
 
@@ -2120,13 +2126,14 @@ impl<'a, 'b> Parser<'a, 'b>
             // places a '--' in the usage string if there are args and options
             // supporting multiple values
             if self.has_positionals() &&
-               self.opts.iter().any(|o| o.b.settings.is_set(ArgSettings::Multiple)) &&
-               self.positionals.values().any(|p| !p.b.settings.is_set(ArgSettings::Required)) &&
+               self.opts.iter().any(|o| o.is_set(ArgSettings::Multiple)) &&
+               self.positionals.values().any(|p| !p.is_set(ArgSettings::Required)) &&
                !self.has_subcommands() {
                 usage.push_str(" [--]")
             }
             if self.has_positionals() &&
-               self.positionals.values().any(|p| !p.b.settings.is_set(ArgSettings::Required)) {
+               self.positionals.values().any(|p| !p.is_set(ArgSettings::Required) && 
+                    !p.is_set(ArgSettings::Hidden)) {
                 if let Some(args_tag) = self.get_args_tag() {
                     usage.push_str(&*args_tag);
                 } else {