fix: (Combined) unmerge-able block shouldn't be repeated

Signed-off-by: Jack Cherng <jfcherng@gmail.com>
jfcherng · Mar 15, 2023 · 3582a09 · 3582a09
1 parent 63bbde6
commit 3582a09
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Renderer/Html/Combined.php b/src/Renderer/Html/Combined.php
@@ -239,7 +239,7 @@ protected function renderTableBlockReplace(array $block): string
                     $this->renderTableBlockDelete($block) .
                     $this->renderTableBlockInsert($block);
 
-                continue;
+                break;
             }
 
             $ret .= $this->renderTableRow('rep', SequenceMatcher::OP_REP, $mergedLine);

diff --git a/tests/Renderer/Html/CombinedTest.php b/tests/Renderer/Html/CombinedTest.php
@@ -47,4 +47,27 @@ public function testHtmlEscapeForOpEq(): void
         static::assertThat($result, static::logicalNot(static::stringContains('<tag>')));
         static::assertThat($result, static::logicalNot(static::stringContains('</tag>')));
     }
+
+    /**
+     * Test unmerge-able block.
+     *
+     * @see https://github.com/jfcherng/php-diff/issues/69
+     */
+    public function testSimpleUnmergeableBlock(): void
+    {
+        $result = DiffHelper::calculate("111\n222\n333\n", "444\n555\n666\n", 'Combined');
+
+        static::assertSame(
+            [1, 1, 1, 1, 1, 1],
+            [
+                \substr_count($result, '111'),
+                \substr_count($result, '222'),
+                \substr_count($result, '333'),
+                \substr_count($result, '444'),
+                \substr_count($result, '555'),
+                \substr_count($result, '666'),
+            ],
+            "Unmerge-able block shouldn't be repeated."
+        );
+    }
 }