[Console] Fix linewraps in OutputFormatter

maxbeckers · maxbeckers · commit c52f9729bfa6 · 2023-08-02T11:33:52.000+02:00
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -258,7 +258,7 @@ private function applyCurrentStyle(string $text, string $current, int $width, in
         }
 
         preg_match('~(\\n)$~', $text, $matches);
-        $text = $prefix.preg_replace('~([^\\n]{'.$width.'})\\ *~', "\$1\n", $text);
+        $text = $prefix.$this->addLineBreaks($text, $width);
         $text = rtrim($text, "\n").($matches[1] ?? '');
 
         if (!$currentLineLength && '' !== $current && "\n" !== substr($current, -1)) {
@@ -282,4 +282,29 @@ private function applyCurrentStyle(string $text, string $current, int $width, in
 
         return implode("\n", $lines);
     }
+
+    private function addLineBreaks(string $text, int $width): string
+    {
+        $result = '';
+        $line = '';
+        $encoding = mb_detect_encoding($text, null, true);
+        for ($i = 0; $i < mb_strlen($text, $encoding); ++$i) {
+            $char = mb_substr($text, $i, 1, $encoding);
+            if ('' === $line && ' ' === $char && ' ' !== mb_substr($text, $i + 1, 1, $encoding)) {
+                continue;
+            }
+            $line .= $char;
+            if ("\n" === $char) {
+                $result .= $line;
+                $line = '';
+            } elseif ($width === mb_strlen($line)) {
+                $result .= $line."\n";
+                $line = '';
+            }
+        }
+
+        $result .= $line;
+
+        return $result;
+    }
 }
diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
@@ -382,6 +382,8 @@ public function testFormatAndWrap()
         $this->assertSame("pre\nfoo\nbar\nbaz\npos\nt", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 3));
         $this->assertSame("pre \nfoo \nbar \nbaz \npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 4));
         $this->assertSame("pre f\noo ba\nr baz\npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 5));
+        $this->assertSame("Â rèälly l\nöng tîtlè \nthät cöüld\nnèêd múltî\nplê línès", $formatter->formatAndWrap('Â rèälly löng tîtlè thät cöüld nèêd múltîplê línès', 10));
+        $this->assertSame("Â rèälly l\nöng tîtlè \nthät cöüld\nnèêd múltî\nplê\nlínès", $formatter->formatAndWrap("Â rèälly löng tîtlè thät cöüld nèêd múltîplê\n línès", 10));
         $this->assertSame('', $formatter->formatAndWrap(null, 5));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,8 @@ public function testFormatAndWrap()`
`382`	`382`	`$this->assertSame("pre\nfoo\nbar\nbaz\npos\nt", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 3));`
`383`	`383`	`$this->assertSame("pre \nfoo \nbar \nbaz \npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 4));`
`384`	`384`	`$this->assertSame("pre f\noo ba\nr baz\npost", $formatter->formatAndWrap('pre <error>foo bar baz</error> post', 5));`
	`385`	`+ $this->assertSame("Â rèälly l\nöng tîtlè \nthät cöüld\nnèêd múltî\nplê línès", $formatter->formatAndWrap('Â rèälly löng tîtlè thät cöüld nèêd múltîplê línès', 10));`
	`386`	`+ $this->assertSame("Â rèälly l\nöng tîtlè \nthät cöüld\nnèêd múltî\nplê\nlínès", $formatter->formatAndWrap("Â rèälly löng tîtlè thät cöüld nèêd múltîplê\n línès", 10));`
`385`	`387`	`$this->assertSame('', $formatter->formatAndWrap(null, 5));`
`386`	`388`	`}`
`387`	`389`	`}`