Prefer the new if we can only show either old or new

Signed-off-by: Jack Cherng <[email protected]>

Author: jfcherng

src/Renderer/Html/AbstractHtml.php

@@ -23,7 +23,7 @@ abstract class AbstractHtml extends AbstractRenderer
     const IS_TEXT_RENDERER = false;
 
     /**
-     * @var array array of the different opcodes and how they are mapped to HTML classes
+     * @var string[] array of the different opcodes and how they are mapped to HTML classes
      *
      * @todo rename to OP_CLASS_MAP in v7
      */

src/Renderer/Html/Combined.php

@@ -126,12 +126,11 @@ protected function renderTableBlockEqual(array $block): string
         // note that although we are in a OP_EQ situation,
         // the old and the new may not be exactly the same
         // because of ignoreCase, ignoreWhitespace, etc
-        foreach ($block['old']['lines'] as $oldLine) {
-            // hmm... but there is only space for one line
-            // we could only pick either the old or the new to show
+        foreach ($block['new']['lines'] as $newLine) {
+            // but in this renderer, we can only pick either the old or the new to show
             $html .=
                 '<tr data-type="=">' .
-                    '<td class="old">' . $oldLine . '</td>' .
+                    '<td class="new">' . $newLine . '</td>' .
                 '</tr>';
         }
 

src/Renderer/Html/Inline.php

@@ -134,8 +134,7 @@ protected function renderTableBlockEqual(array $block): string
         // the old and the new may not be exactly the same
         // because of ignoreCase, ignoreWhitespace, etc
         foreach ($block['new']['lines'] as $no => $newLine) {
-            // hmm... but there is only space for one line
-            // we could only pick either the old or the new to show
+            // but in this renderer, we can only pick either the old or the new to show
             $oldLineNum = $block['old']['offset'] + $no + 1;
             $newLineNum = $block['new']['offset'] + $no + 1;
 

src/Renderer/Text/Unified.php

@@ -44,7 +44,11 @@ protected function renderWorker(Differ $differ): string
             $ret .= $this->renderHunkHeader($i1 + 1, $i2 - $i1, $j1 + 1, $j2 - $j1);
 
             foreach ($hunk as [$op, $i1, $i2, $j1, $j2]) {
+                // note that although we are in a OP_EQ situation,
+                // the old and the new may not be exactly the same
+                // because of ignoreCase, ignoreWhitespace, etc
                 if ($op === SequenceMatcher::OP_EQ) {
+                    // we could only pick either the old or the new to show
                     $ret .= $this->renderContext(' ', $differ->getNew($j1, $j2));
 
                     continue;