[Console] fixed exception rendering when nested styles

fabpot · fabpot · commit c8d034288762 · 2013-09-17T14:55:19.000+02:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -23,7 +23,6 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Command\HelpCommand;
 use Symfony\Component\Console\Command\ListCommand;
-use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Helper\DialogHelper;
@@ -809,29 +808,29 @@ public function renderException($e, $output)
             $title = sprintf('  [%s]  ', get_class($e));
             $len = $strlen($title);
             $width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : PHP_INT_MAX;
+            $formatter = $output->getFormatter();
             $lines = array();
             foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
                 foreach (str_split($line, $width - 4) as $line) {
-                    $lines[] = sprintf('  %s  ', $line);
-                    $len = max($strlen($line) + 4, $len);
+                    // pre-format lines to get the right string length
+                    $lineLength = $strlen(preg_replace('/\[[^m]*m/', '', $formatter->format($line))) + 4;
+                    $lines[] = array($line, $lineLength);
+
+                    $len = max($lineLength, $len);
                 }
             }
 
-            $messages = array(str_repeat(' ', $len), $title.str_repeat(' ', max(0, $len - $strlen($title))));
-
+            $messages = array('', '');
+            $messages[] = $emptyLine = $formatter->format(sprintf('<error>%s</error>', str_repeat(' ', $len)));
+            $messages[] = $formatter->format(sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $strlen($title)))));
             foreach ($lines as $line) {
-                $messages[] = $line.str_repeat(' ', $len - $strlen($line));
+                $messages[] = $formatter->format(sprintf('<error>  %s  %s</error>', $line[0], str_repeat(' ', $len - $line[1])));
             }
+            $messages[] = $emptyLine;
+            $messages[] = '';
+            $messages[] = '';
 
-            $messages[] = str_repeat(' ', $len);
-
-            $output->writeln("");
-            $output->writeln("");
-            foreach ($messages as $message) {
-                $output->writeln('<error>'.OutputFormatter::escape($message).'</error>');
-            }
-            $output->writeln("");
-            $output->writeln("");
+            $output->writeln($messages, OutputInterface::OUTPUT_RAW);
 
             if (OutputInterface::VERBOSITY_VERBOSE === $output->getVerbosity()) {
                 $output->writeln('<comment>Exception trace:</comment>');
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Foo3Command.php b/src/Symfony/Component/Console/Tests/Fixtures/Foo3Command.php
@@ -20,7 +20,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             try {
                 throw new \Exception("First exception <p>this is html</p>");
             } catch (\Exception $e) {
-                throw new \Exception("Second exception <comment>comment<comment>", 0, $e);
+                throw new \Exception("Second exception <comment>comment</comment>", 0, $e);
             }
         } catch (\Exception $e) {
             throw new \Exception("Third exception <fg=blue;bg=red>comment</>", 0, $e);
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt
@@ -1,17 +1,17 @@
 
 
-                                              
-  [Exception]                                 
-  Third exception <fg=blue;bg=red>comment</>  
-                                              
+                           
+  [Exception]              
+  Third exception comment  
+                           
 
 
 
 
-                                              
-  [Exception]                                 
-  Second exception <comment>comment<comment>  
-                                              
+                            
+  [Exception]               
+  Second exception comment  
+                            
 
 
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt
@@ -1,24 +1,24 @@
 
 
-[37;41m                                              [0m
-[37;41m  [Exception]                                 [0m
-[37;41m  Third exception <fg=blue;bg=red>comment</>  [0m
-[37;41m                                              [0m
+[37;41m                           [0m
+[37;41m  [Exception]              [0m
+[37;41m  Third exception [0m[34;41mcomment[0m[37;41m  [0m
+[37;41m                           [0m
 
 
 
 
-[37;41m                                              [0m
-[37;41m  [Exception]                                 [0m
-[37;41m  Second exception <comment>comment<comment>  [0m
-[37;41m                                              [0m
+[37;41m                            [0m
+[37;41m  [Exception]               [0m
+[37;41m  Second exception [0m[33mcomment[0m[37;41m  [0m
+[37;41m                            [0m
 
 
 
 
 [37;41m                                       [0m
 [37;41m  [Exception]                          [0m
-[37;41m  First exception <p>this is html</p>  [0m
+[37;41m  First exception [0m[37;41m<p>this is html[0m[37;41m</p>  [0m
 [37;41m                                       [0m
 
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`20`	`20`	`try {`
`21`	`21`	`throw new \Exception("First exception <p>this is html</p>");`
`22`	`22`	`} catch (\Exception $e) {`
`23`		`- throw new \Exception("Second exception <comment>comment<comment>", 0, $e);`
	`23`	`+ throw new \Exception("Second exception <comment>comment</comment>", 0, $e);`
`24`	`24`	`}`
`25`	`25`	`} catch (\Exception $e) {`
`26`	`26`	`throw new \Exception("Third exception <fg=blue;bg=red>comment</>", 0, $e);`
-Original file line number
+Diff line change
@@ @@ -1,24 +1,24 @@ @@
 -[37;41m                                              [0m
 -[37;41m  [Exception]                                 [0m
 -[37;41m  Third exception <fg=blue;bg=red>comment</>  [0m
 -[37;41m                                              [0m
 +[37;41m                           [0m
 +[37;41m  [Exception]              [0m
 +[37;41m  Third exception [0m[34;41mcomment[0m[37;41m  [0m
 +[37;41m                           [0m
 -[37;41m                                              [0m
 -[37;41m  [Exception]                                 [0m
 -[37;41m  Second exception <comment>comment<comment>  [0m
 -[37;41m                                              [0m
 +[37;41m                            [0m
 +[37;41m  [Exception]               [0m
 +[37;41m  Second exception [0m[33mcomment[0m[37;41m  [0m
 +[37;41m                            [0m
 [37;41m                                       [0m
 [37;41m  [Exception]                          [0m
 -[37;41m  First exception <p>this is html</p>  [0m
 +[37;41m  First exception [0m[37;41m<p>this is html[0m[37;41m</p>  [0m
 [37;41m                                       [0m