fix(help): Correctly calculate wrap points with ANSI escape codes

We mixed up whether `i` represented the absolute position or our
incremental position.

Fixes #6147

Author: epage

clap_builder/src/builder/styled_str.rs

@@ -245,7 +245,10 @@ mod wrap_tests {
         actual.wrap(20);
         assert_data_eq!(
             actual.ansi().to_string(),
-            str!["12345 12345 12345 12345"]
+            str![[r#"
+12345 12345 12345 
+12345
+"#]]
         );
     }
 }

clap_builder/src/output/textwrap/mod.rs

@@ -92,7 +92,7 @@ mod test {
         // will be empty. This is because the string is split into
         // words like [" ", "foobar ", "baz"], which puts "foobar " on
         // the second line. We never output trailing whitespace
-        assert_eq!(wrap(" foobar baz", 6), vec!["", " foobar", " baz"]);
+        assert_eq!(wrap(" foobar baz", 6), vec![" foobar", " baz"]);
     }
 
     #[test]

clap_builder/src/output/textwrap/wrap_algorithms.rs

@@ -22,7 +22,9 @@ impl<'w> LineWrapper<'w> {
     }
 
     pub(crate) fn wrap(&mut self, mut words: Vec<&'w str>) -> Vec<&'w str> {
+        let mut first_word = false;
         if self.indentation.is_none() {
+            first_word = true;
             if let Some(word) = words.first() {
                 if word.trim().is_empty() {
                     self.indentation = Some(*word);
@@ -38,7 +40,10 @@ impl<'w> LineWrapper<'w> {
             let trimmed = word.trim_end();
             let word_width = display_width(trimmed);
             let trimmed_delta = word.len() - trimmed.len();
-            if i != 0 && self.hard_width < self.line_width + word_width {
+            if first_word && 0 < word_width {
+                // Never try to wrap the first word
+                first_word = false;
+            } else if self.hard_width < self.line_width + word_width {
                 if 0 < i {
                     let prev = i - 1;
                     let trimmed = words[prev].trim_end();