[Console] Avoid extra blank lines when rendering exceptions

ogizanagi · ogizanagi · commit 2e158df2c7c1 · 2015-12-17T00:47:15.000+01:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -673,6 +673,8 @@ public function asXml($namespace = null, $asDom = false)
      */
     public function renderException($e, $output)
     {
+        $output->writeln('');
+
         do {
             $title = sprintf('  [%s]  ', get_class($e));
 
@@ -695,15 +697,14 @@ public function renderException($e, $output)
                 }
             }
 
-            $messages = array('', '');
+            $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 - $this->stringWidth($title)))));
             foreach ($lines as $line) {
                 $messages[] = $formatter->format(sprintf('<error>  %s  %s</error>', $line[0], str_repeat(' ', $len - $line[1])));
             }
             $messages[] = $emptyLine;
             $messages[] = '';
-            $messages[] = '';
 
             $output->writeln($messages, OutputInterface::OUTPUT_RAW);
 
@@ -730,14 +731,12 @@ public function renderException($e, $output)
                 }
 
                 $output->writeln('');
-                $output->writeln('');
             }
         } while ($e = $e->getPrevious());
 
         if (null !== $this->runningCommand) {
             $output->writeln(sprintf('<info>%s</info>', sprintf($this->runningCommand->getSynopsis(), $this->getName())));
             $output->writeln('');
-            $output->writeln('');
         }
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception1.txt
@@ -1,8 +1,6 @@
 
-
                                  
   [InvalidArgumentException]     
   Command "foo" is not defined.  
                                  
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
@@ -1,11 +1,8 @@
 
-
                                       
   [InvalidArgumentException]          
   The "--foo" option does not exist.  
                                       
 
-
 list [--xml] [--raw] [--format="..."] [namespace]
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt
@@ -1,27 +1,18 @@
 
-
                            
   [Exception]              
   Third exception comment  
                            
 
-
-
-
                             
   [Exception]               
   Second exception comment  
                             
 
-
-
-
                                        
   [Exception]                          
   First exception <p>this is html</p>  
                                        
 
-
 foo3:bar
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt
@@ -1,27 +1,18 @@
 
-
 [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 [0m[33mcomment[0m[37;41m  [0m
 [37;41m                            [0m
 
-
-
-
 [37;41m                                       [0m
 [37;41m  [Exception]                          [0m
 [37;41m  First exception [0m[37;41m<p>[0m[37;41mthis is html[0m[37;41m</p>[0m[37;41m  [0m
 [37;41m                                       [0m
 
-
 [32mfoo3:bar[0m
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception4.txt
@@ -1,9 +1,7 @@
 
-
                                
   [InvalidArgumentException]   
   Command "foo" is not define  
   d.                           
                                
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt
@@ -1,11 +1,8 @@
 
-
                     
   [Exception]       
   エラーメッセージ  
                     
 
-
 foo
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
@@ -1,11 +1,8 @@
 
-
 [37;41m                    [0m
 [37;41m  [Exception]       [0m
 [37;41m  エラーメッセージ  [0m
 [37;41m                    [0m
 
-
 [32mfoo[0m
 
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt
@@ -1,12 +1,9 @@
 
-
                               
   [Exception]                 
   コマンドの実行中にエラーが  
   発生しました。              
                               
 
-
 foo
 
-

Original file line number	Diff line number	Diff line change
`@@ -673,6 +673,8 @@ public function asXml($namespace = null, $asDom = false)`
`673`	`673`	`*/`
`674`	`674`	`public function renderException($e, $output)`
`675`	`675`	`{`
	`676`	`+ $output->writeln('');`
	`677`	`+`
`676`	`678`	`do {`
`677`	`679`	`$title = sprintf(' [%s] ', get_class($e));`
`678`	`680`
`@@ -695,15 +697,14 @@ public function renderException($e, $output)`
`695`	`697`	`}`
`696`	`698`	`}`
`697`	`699`
`698`		`- $messages = array('', '');`
	`700`	`+ $messages = array();`
`699`	`701`	`$messages[] = $emptyLine = $formatter->format(sprintf('<error>%s</error>', str_repeat(' ', $len)));`
`700`	`702`	`$messages[] = $formatter->format(sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title)))));`
`701`	`703`	`foreach ($lines as $line) {`
`702`	`704`	`$messages[] = $formatter->format(sprintf('<error> %s %s</error>', $line[0], str_repeat(' ', $len - $line[1])));`
`703`	`705`	`}`
`704`	`706`	`$messages[] = $emptyLine;`
`705`	`707`	`$messages[] = '';`
`706`		`- $messages[] = '';`
`707`	`708`
`708`	`709`	`$output->writeln($messages, OutputInterface::OUTPUT_RAW);`
`709`	`710`
`@@ -730,14 +731,12 @@ public function renderException($e, $output)`
`730`	`731`	`}`
`731`	`732`
`732`	`733`	`$output->writeln('');`
`733`		`- $output->writeln('');`
`734`	`734`	`}`
`735`	`735`	`} while ($e = $e->getPrevious());`
`736`	`736`
`737`	`737`	`if (null !== $this->runningCommand) {`
`738`	`738`	`$output->writeln(sprintf('<info>%s</info>', sprintf($this->runningCommand->getSynopsis(), $this->getName())));`
`739`	`739`	`$output->writeln('');`
`740`		`- $output->writeln('');`
`741`	`740`	`}`
`742`	`741`	`}`
`743`	`742`
-Original file line number
+Diff line change
@@ @@ -1,8 +1,6 @@ @@
+-
   [InvalidArgumentException]
   Command "foo" is not defined.
+-
-Original file line number
+Diff line change
@@ @@ -1,27 +1,18 @@ @@
+-
 [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 [0m[33mcomment[0m[37;41m  [0m
 [37;41m                            [0m
+-
+-
+-
 [37;41m                                       [0m
 [37;41m  [Exception]                          [0m
 [37;41m  First exception [0m[37;41m<p>[0m[37;41mthis is html[0m[37;41m</p>[0m[37;41m  [0m
 [37;41m                                       [0m
+-
 [32mfoo3:bar[0m
+-