Diff mode Merged shows result only partially

[vendeeglobe]

After implementing the Merged mode a few days ago using php-diff 2.3.1, it seems that the HTML Merged mode shows the diff only partially in comparison to Unified or SideBySide.

Example:
Unified

Merged

Example text:
version_a.txt
version_b.txt

[DigiLive]

Can you mention the lines you are referring to?
HTML merged only marks inline differences and added blocks text.
Blocks of texts which are removed at version 2, are marked in line column of the table:

[vendeeglobe]

Ignores changes in line
19 to 21
70 to 86
99 - not shown at all, not like in your example above

Example: (enabled diff for guests temporarily)
https://wackowiki.org/doc/Doc/English/Themes/diff?a=4227&b=0&diffmode=5

[DigiLive]

Which options did you provide to the Diff class?

[vendeeglobe]

No options, only default. Should I set particular options for Merged?

https://github.com/WackoWiki/wackowiki/blob/master/wacko/handler/page/diff.php#L352

[vendeeglobe]

I forgot to mention that I use PHP 8.0.

Found this in the error log with varying array keys:
PHP Warning: Undefined array key 5 in /lib/php-diff/Diff/Renderer/Html/Merged.php on line 217

preg_match_all('/\x0.*?\x1/', $changes['changed']['lines'][$lineNo], $addedParts, PREG_PATTERN_ORDER);

[DigiLive]

I didn't test with php 8, bit I'm still suprised by it.
I'll take a look into it soon.

Thank you for testing and feedback.

[DigiLive]

I forgot to mention that I use PHP 8.0.

Found this in the error log with varying array keys:
PHP Warning: Undefined array key 5 in /lib/php-diff/Diff/Renderer/Html/Merged.php on line 217

preg_match_all('/\x0.*?\x1/', $changes['changed']['lines'][$lineNo], $addedParts, PREG_PATTERN_ORDER);

Something is incorrect with your error description or file. See below lines.

php-diff/lib/jblond/Diff/Renderer/Html/Merged.php

Lines 216 to 218 in 9830fe0

	if (!$lineNo && $this->lastDeleted !== null) {
	$headerClass = 'ChangeDelete';
	}

Also the script doesn't throw a warning or error at my local server, using php v8.0.2.

[vendeeglobe]

I patched away the table header therfore the different line number.
https://github.com/WackoWiki/wackowiki/blob/master/wacko/lib/php-diff/Diff/Renderer/Html/Merged.php#L217

The error messages are from the server log and do probably not belong to the posted example. I turned error reporting on again after posting the issue.

[DigiLive]

I've created a new issue for it since it seems unrelated to the original report.
Please continue the discussion about the thrown warning over there.

Also you don't have to patch the renderer. You can create your own or extend an included one.
See https://github.com/JBlond/php-diff/wiki/3.-Custom-Renderer

[DigiLive]

Ignores changes in line
19 to 21
70 to 86
99 - not shown at all, not like in your example above

---

19 to 21: Bug confirmed. Will create a PR for it soon.
70-86: Marked as inserted (see below).
99: Table header marked as deleted at version 1 (see below).

[DigiLive]

Don't forget to clear you browsers cache to pull in the newest css files.

[vendeeglobe]

Already merged and Browser cache has been purged.