Fix problem caused by in OP_EQ, it still may be $old !== $new

Two different line could be marked as the same,
because of ignoreCase, ignoreWhitespace, etc.

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

Author: jfcherng

src/Renderer/Html/AbstractHtml.php

@@ -77,17 +77,13 @@ public function getChanges(): array
                 $lastTag = $tag;
 
                 if ($tag === SequenceMatcher::OP_EQ) {
-                    /**
-                     * @todo Technically this is wrong.
-                     *       The old and the new may not be exactly the same
-                     *       because of ignoreCase and ignoreWhitespace.
-                     */
-                    if (!empty($lines = \array_slice($old, $i1, $i2 - $i1))) {
-                        $formattedLines = $this->formatLines($lines);
-
-                        $blocks[$lastBlock]['base']['lines'] += $formattedLines;
-                        $blocks[$lastBlock]['changed']['lines'] += $formattedLines;
-                    }
+                    // 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
+                    $lines = \array_slice($old, $i1, $i2 - $i1);
+                    $blocks[$lastBlock]['base']['lines'] += $this->formatLines($lines);
+                    $lines = \array_slice($new, $j1, $j2 - $j1);
+                    $blocks[$lastBlock]['changed']['lines'] += $this->formatLines($lines);
 
                     continue;
                 }

src/Renderer/Html/Inline.php

@@ -124,7 +124,12 @@ protected function renderTableEqual(array $change): string
     {
         $html = '';
 
-        foreach ($change['base']['lines'] as $no => $line) {
+        // 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 ($change['base']['lines'] as $no => $oldLine) {
+            // hmm... but this is a inline template
+            // we could only pick a line from the base or the changed to show
             $oldLineNum = $change['base']['offset'] + $no + 1;
             $newLineNum = $change['changed']['offset'] + $no + 1;
 
@@ -133,7 +138,7 @@ protected function renderTableEqual(array $change): string
                     '<th class="f-num">' . $oldLineNum . '</th>' .
                     '<th class="t-num">' . $newLineNum . '</th>' .
                     '<th class="sign"></th>' .
-                    '<td class="old">' . $line . '</td>' .
+                    '<td class="old">' . $oldLine . '</td>' .
                 '</tr>';
         }
 

src/Renderer/Html/SideBySide.php

@@ -122,16 +122,21 @@ protected function renderTableEqual(array $change): string
     {
         $html = '';
 
-        foreach ($change['base']['lines'] as $no => $line) {
+        // 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 ($change['base']['lines'] as $no => $oldLine) {
+            $newLine = $change['changed']['lines'][$no];
+
             $oldLineNum = $change['base']['offset'] + $no + 1;
-            $newLine = $change['changed']['offset'] + $no + 1;
+            $newLineNum = $change['changed']['offset'] + $no + 1;
 
             $html .=
                 '<tr>' .
                     '<th class="f-num">' . $oldLineNum . '</th>' .
-                    '<td class="old">' . $line . '</td>' .
-                    '<th class="t-num">' . $newLine . '</th>' .
-                    '<td class="new">' . $line . '</td>' .
+                    '<td class="old">' . $oldLine . '</td>' .
+                    '<th class="t-num">' . $newLineNum . '</th>' .
+                    '<td class="new">' . $newLine . '</td>' .
                 '</tr>';
         }