fix(help): Properly wrap subcommand about

Fixes #5607

Author: epage

clap_builder/src/output/help_template.rs

@@ -650,7 +650,7 @@ impl<'cmd, 'writer> HelpTemplate<'cmd, 'writer> {
 
         let spaces = if next_line_help {
             TAB.len() + NEXT_LINE_INDENT.len()
-        } else if let Some(true) = arg.map(|a| a.is_positional()) {
+        } else if arg.map(|a| a.is_positional()).unwrap_or(true) {
             longest + TAB_WIDTH * 2
         } else {
             longest + TAB_WIDTH * 2 + 4 // See `fn short` for the 4

tests/builder/help.rs

@@ -577,9 +577,8 @@ Usage: test [OPTIONS] [COMMAND]
 
 Commands:
   sub1  One two three four five six seven eight nine ten eleven
-            twelve thirteen fourteen fifteen
-  help  Print this message or the help of the given
-            subcommand(s)
+        twelve thirteen fourteen fifteen
+  help  Print this message or the help of the given subcommand(s)
 
 Options:
   -a, --all            Also do versioning for private crates (will
@@ -635,9 +634,8 @@ Usage: test [OPTIONS] [COMMAND]
 
 Commands:
   sub1  One two three four five six seven eight nine ten eleven
-            twelve thirteen fourteen fifteen
-  help  Print this message or the help of the given
-            subcommand(s)
+        twelve thirteen fourteen fifteen
+  help  Print this message or the help of the given subcommand(s)
 
 Options:
   -a, --all            Also do versioning for private crates (will