Merge SideBySide insert/delete columns when lineNumbers is false

#21

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

Author: jfcherng

src/Renderer/Html/SideBySide.php

@@ -116,16 +116,23 @@ protected function renderTableEqual(array $change): string
         foreach ($change['old']['lines'] as $no => $oldLine) {
             $newLine = $change['new']['lines'][$no];
 
-            $oldLineNum = $change['old']['offset'] + $no + 1;
-            $newLineNum = $change['new']['offset'] + $no + 1;
+            if ($this->options['lineNumbers']) {
+                $oldLineNum = $change['old']['offset'] + $no + 1;
+                $newLineNum = $change['new']['offset'] + $no + 1;
 
-            $html .=
-                '<tr>' .
-                    $this->renderLineNumberColumn('old', $oldLineNum) .
-                    '<td class="old">' . $oldLine . '</td>' .
-                    $this->renderLineNumberColumn('new', $newLineNum) .
-                    '<td class="new">' . $newLine . '</td>' .
-                '</tr>';
+                $html .=
+                    '<tr>' .
+                        $this->renderLineNumberColumn('old', $oldLineNum) .
+                        '<td class="old">' . $oldLine . '</td>' .
+                        $this->renderLineNumberColumn('new', $newLineNum) .
+                        '<td class="new">' . $newLine . '</td>' .
+                    '</tr>';
+            } else {
+                $html .=
+                    '<tr>' .
+                        '<td class="new" colspan="2">' . $newLine . '</td>' .
+                    '</tr>';
+            }
         }
 
         return $html;
@@ -141,15 +148,22 @@ protected function renderTableInsert(array $change): string
         $html = '';
 
         foreach ($change['new']['lines'] as $no => $newLine) {
-            $newLineNum = $change['new']['offset'] + $no + 1;
+            if ($this->options['lineNumbers']) {
+                $newLineNum = $change['new']['offset'] + $no + 1;
 
-            $html .=
-                '<tr>' .
-                    $this->renderLineNumberColumn('', null) .
-                    '<td class="old"></td>' .
-                    $this->renderLineNumberColumn('new', $newLineNum) .
-                    '<td class="new">' . $newLine . '</td>' .
-                '</tr>';
+                $html .=
+                    '<tr>' .
+                        $this->renderLineNumberColumn('', null) .
+                        '<td class="old"></td>' .
+                        $this->renderLineNumberColumn('new', $newLineNum) .
+                        '<td class="new">' . $newLine . '</td>' .
+                    '</tr>';
+            } else {
+                $html .=
+                    '<tr>' .
+                        '<td class="new" colspan="2">' . $newLine . '</td>' .
+                    '</tr>';
+            }
         }
 
         return $html;
@@ -165,15 +179,22 @@ protected function renderTableDelete(array $change): string
         $html = '';
 
         foreach ($change['old']['lines'] as $no => $oldLine) {
-            $oldLineNum = $change['old']['offset'] + $no + 1;
+            if ($this->options['lineNumbers']) {
+                $oldLineNum = $change['old']['offset'] + $no + 1;
 
-            $html .=
-                '<tr>' .
-                    $this->renderLineNumberColumn('old', $oldLineNum) .
-                    '<td class="old">' . $oldLine . '</td>' .
-                    $this->renderLineNumberColumn('', null) .
-                    '<td class="new"></td>' .
-                '</tr>';
+                $html .=
+                    '<tr>' .
+                        $this->renderLineNumberColumn('old', $oldLineNum) .
+                        '<td class="old">' . $oldLine . '</td>' .
+                        $this->renderLineNumberColumn('', null) .
+                        '<td class="new"></td>' .
+                    '</tr>';
+            } else {
+                $html .=
+                    '<tr>' .
+                        '<td class="old" colspan="2">' . $oldLine . '</td>' .
+                    '</tr>';
+            }
         }
 
         return $html;