Combined: fix HTML output

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

Author: jfcherng

src/Renderer/Html/Combined.php

@@ -275,7 +275,7 @@ protected function mergeReplaceLines(string $oldLine, string $newLine): string
             );
         }
 
-        return \str_replace(["\r\n", "\r", "\n"], '<br>', $mergedLine);
+        return $this->fixReplaceLineHtml($mergedLine);
     }
 
     /**
@@ -391,4 +391,36 @@ protected function fixLinesForNoClosure(array &$lines, array $closures): void
             }
         }
     }
+
+    /**
+     * Perform some special fixes for the "replace"-type output HTML.
+     *
+     * @param string $string the string
+     */
+    protected function fixReplaceLineHtml(string $string): string
+    {
+        static $rules;
+
+        if (!isset($rules)) {
+            $delL = \preg_quote(RendererConstant::HTML_CLOSURES_DEL[0], '/');
+            $delR = \preg_quote(RendererConstant::HTML_CLOSURES_DEL[1], '/');
+            $insL = \preg_quote(RendererConstant::HTML_CLOSURES_INS[0], '/');
+            $insR = \preg_quote(RendererConstant::HTML_CLOSURES_INS[1], '/');
+
+            $rules = [
+                // move leading "\n" to be out of closures
+                "/{$delL}([\r\n]++)/uS" => '$1' . RendererConstant::HTML_CLOSURES_DEL[0],
+                "/{$insL}([\r\n]++)/uS" => '$1' . RendererConstant::HTML_CLOSURES_INS[0],
+                // move trailing "\n" to be out of closures
+                "/([\r\n]++){$delR}/uS" => RendererConstant::HTML_CLOSURES_DEL[1] . '$1',
+                "/([\r\n]++){$insR}/uS" => RendererConstant::HTML_CLOSURES_INS[1] . '$1',
+            ];
+        }
+
+        foreach ($rules as $pattern => $replace) {
+            $string = \preg_replace($pattern, $replace, $string);
+        }
+
+        return \str_replace(["\r\n", "\r", "\n"], '<br>', $string);
+    }
 }