[Differ] Remove ConsoleDiffer, use DefaultDiffer that utilize ColorConsoleDiffFormatter instead to avoid double diffing process

fix cs

Author: samsonasik

e2e/e2eTestRunner.php

@@ -7,6 +7,7 @@
 use Rector\Console\Formatter\ColorConsoleDiffFormatter;
 use Rector\Console\Formatter\ConsoleDiffer;
 use Rector\Console\Style\SymfonyStyleFactory;
+use Rector\Differ\DefaultDiffer;
 use Rector\Util\Reflection\PrivatesAccessor;
 use Symfony\Component\Console\Command\Command;
 
@@ -62,8 +63,9 @@
 }
 
 // print color diff, to make easy find the differences
-$consoleDiffer = new ConsoleDiffer(new ColorConsoleDiffFormatter());
-$diff = $consoleDiffer->diff($output, $expectedOutput);
+$defaultDiffer = new DefaultDiffer();
+$colorConsoleDiffFormatter = new ColorConsoleDiffFormatter();
+$diff = $colorConsoleDiffFormatter->format($consoleDiffer->diff($output, $expectedOutput));
 $symfonyStyle->writeln($diff);
 
 exit(Command::FAILURE);

e2e/e2eTestRunnerWithCache.php

@@ -7,6 +7,7 @@
 use Rector\Console\Formatter\ColorConsoleDiffFormatter;
 use Rector\Console\Formatter\ConsoleDiffer;
 use Rector\Console\Style\SymfonyStyleFactory;
+use Rector\Differ\DefaultDiffer;
 use Rector\Util\Reflection\PrivatesAccessor;
 use Symfony\Component\Console\Command\Command;
 
@@ -40,8 +41,9 @@
 }
 
 // print color diff, to make easy find the differences
-$consoleDiffer = new ConsoleDiffer(new ColorConsoleDiffFormatter());
-$diff = $consoleDiffer->diff($output, $expectedOutput);
+$defaultDiffer = new DefaultDiffer();
+$colorConsoleDiffFormatter = new ColorConsoleDiffFormatter();
+$diff = $colorConsoleDiffFormatter->format($consoleDiffer->diff($output, $expectedOutput));
 $symfonyStyle->writeln($diff);
 
 exit(Command::FAILURE);

src/ChangesReporting/ValueObjectFactory/FileDiffFactory.php

@@ -5,7 +5,7 @@
 namespace Rector\ChangesReporting\ValueObjectFactory;
 
 use Rector\ChangesReporting\ValueObject\RectorWithLineChange;
-use Rector\Console\Formatter\ConsoleDiffer;
+use Rector\Console\Formatter\ColorConsoleDiffFormatter;
 use Rector\Differ\DefaultDiffer;
 use Rector\FileSystem\FilePathHelper;
 use Rector\ValueObject\Application\File;
@@ -15,8 +15,8 @@
 {
     public function __construct(
         private DefaultDiffer $defaultDiffer,
-        private ConsoleDiffer $consoleDiffer,
         private FilePathHelper $filePathHelper,
+        private ColorConsoleDiffFormatter $colorConsoleDiffFormatter
     ) {
     }
 
@@ -32,11 +32,13 @@ public function createFileDiffWithLineChanges(
     ): FileDiff {
         $relativeFilePath = $this->filePathHelper->relativePath($file->getFilePath());
 
+        $diff = $this->defaultDiffer->diff($oldContent, $newContent);
+
         // always keep the most recent diff
         return new FileDiff(
             $relativeFilePath,
-            $shouldShowDiffs ? $this->defaultDiffer->diff($oldContent, $newContent) : '',
-            $shouldShowDiffs ? $this->consoleDiffer->diff($oldContent, $newContent) : '',
+            $shouldShowDiffs ? $diff : '',
+            $shouldShowDiffs ? $this->colorConsoleDiffFormatter->format($diff) : '',
             $rectorsWithLineChanges
         );
     }

src/Console/Formatter/ColorConsoleDiffFormatter.php

@@ -34,6 +34,12 @@
      */
     private const AT_START_REGEX = '#^(@.*)#';
 
+    /**
+     * @var string
+     * @see https://regex101.com/r/8MXnfa/1
+     */
+    private const AT_DIFF_LINE_REGEX = '#^\<fg=cyan\>@@( \-\d+,\d+ \+\d+,\d+ )@@\<\/fg=cyan\>$#';
+
     private string $template;
 
     public function __construct()
@@ -71,6 +77,7 @@ private function formatWithTemplate(string $diff, string $template): string
             $string = $this->makePlusLinesGreen($string);
             $string = $this->makeMinusLinesRed($string);
             $string = $this->makeAtNoteCyan($string);
+            $string = $this->normalizeLineAtDiff($string);
 
             if ($string === ' ') {
                 return '';
@@ -82,6 +89,14 @@ private function formatWithTemplate(string $diff, string $template): string
         return sprintf($template, implode(PHP_EOL, $coloredLines));
     }
 
+    /**
+     * Remove number diff, eg; @@ -67,6 +67,8 @@ to become @@ @@
+     */
+    private function normalizeLineAtDiff(string $line): string
+    {
+        return Strings::replace($line, self::AT_DIFF_LINE_REGEX, '@@ @@');
+    }
+
     private function makePlusLinesGreen(string $string): string
     {
         return Strings::replace($string, self::PLUS_START_REGEX, '<fg=green>$1</fg=green>');