refactor(help): Make empty tracking more consistent

Author: epage

clap_builder/src/output/help_template.rs

@@ -635,10 +635,11 @@ impl HelpTemplate<'_, '_> {
         let trailing_indent = self.get_spaces(trailing_indent);
 
         let mut help = about.clone();
+        let mut help_is_empty = help.is_empty();
         help.replace_newline_var();
 
         if !spec_vals.is_empty() {
-            if !help.is_empty() {
+            if !help_is_empty {
                 let sep = if self.use_long && arg.is_some() {
                     "\n\n"
                 } else {
@@ -647,6 +648,7 @@ impl HelpTemplate<'_, '_> {
                 help.push_str(sep);
             }
             help.push_str(spec_vals);
+            help_is_empty = help.is_empty();
         }
 
         let avail_chars = self.term_w.saturating_sub(spaces);
@@ -658,7 +660,6 @@ impl HelpTemplate<'_, '_> {
         );
         help.wrap(avail_chars);
         help.indent("", &trailing_indent);
-        let help_is_empty = help.is_empty();
         self.writer.push_styled(&help);
 
         if let Some(arg) = arg {