Fix #58 - Side by side diff shows empty diff

DigiLive · DigiLive · commit 02695d5c2a52 · 2020-08-05T11:27:28.000+02:00
diff --git a/lib/jblond/Diff/Renderer/Html/SideBySide.php b/lib/jblond/Diff/Renderer/Html/SideBySide.php
@@ -208,15 +208,11 @@ public function generateLinesReplace(array $changes): string
                 $fromLine    = $changes['base']['offset'] + $lineNo + 1;
                 $toLine      = "&nbsp;";
                 $changedLine = "&nbsp;";
-
                 if (isset($changes['changed']['lines'][$lineNo])) {
                     $toLine      = $changes['changed']['offset'] + $lineNo + 1;
                     $changedLine = $changes['changed']['lines'][$lineNo];
                 }
 
-                $line        = str_replace(["\0", "\1"], $this->options['deleteMarkers'], $line);
-                $changedLine = str_replace(["\0", "\1"], $this->options['insertMarkers'], $changedLine);
-
                 $html .= <<<HTML
 <tr>
     <th>$fromLine</th>
@@ -230,6 +226,31 @@ public function generateLinesReplace(array $changes): string
 </tr>
 HTML;
             }
+
+            return $html;
+        }
+
+        foreach ($changes['changed']['lines'] as $lineNo => $changedLine) {
+            $toLine   = $changes['changed']['offset'] + $lineNo + 1;
+            $fromLine = "&nbsp;";
+            $line     = "&nbsp;";
+            if (isset($changes['base']['lines'][$lineNo])) {
+                $fromLine = $changes['base']['offset'] + $lineNo + 1;
+                $line     = $changes['base']['lines'][$lineNo];
+            }
+
+            $html .= <<<HTML
+<tr>
+    <th>$fromLine</th>
+    <td class="Left">
+        <span>$line</span>
+    </td>
+    <th>$toLine</th>
+    <td class="Right">
+        <span>$changedLine</span>
+    </td>
+</tr>
+HTML;
         }
 
         return $html;
