Merge pull request #4902 from epage/sub

fix(help): Don't use next-line-help on long-help for subcommands
clap-rs · May 19, 2023 · 65d44aa · 65d44aa
2 parents d597cf7 + c3fe7ff
commit 65d44aa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/clap_builder/src/output/help_template.rs b/clap_builder/src/output/help_template.rs
@@ -963,7 +963,8 @@ impl<'cmd, 'writer> HelpTemplate<'cmd, 'writer> {
     }
 
     fn subcommand_next_line_help(&self, cmd: &Command, spec_vals: &str, longest: usize) -> bool {
-        if self.next_line_help | self.use_long {
+        // Ignore `self.use_long` since subcommands are only shown as short help
+        if self.next_line_help {
             // setting_next_line
             true
         } else {

diff --git a/tests/ui/help_cmd_stdout.toml b/tests/ui/help_cmd_stdout.toml
@@ -5,10 +5,8 @@ stdout = """
 Usage: stdio-fixture[EXE] [OPTIONS] [COMMAND]
 
 Commands:
-  more
-          
-  help
-          Print this message or the help of the given subcommand(s)
+  more  
+  help  Print this message or the help of the given subcommand(s)
 
 Options:
       --verbose

diff --git a/tests/ui/help_flag_stdout.toml b/tests/ui/help_flag_stdout.toml
@@ -5,10 +5,8 @@ stdout = """
 Usage: stdio-fixture[EXE] [OPTIONS] [COMMAND]
 
 Commands:
-  more
-          
-  help
-          Print this message or the help of the given subcommand(s)
+  more  
+  help  Print this message or the help of the given subcommand(s)
 
 Options:
       --verbose