Skip to content

Commit e8d9942

Browse files
committed
Update jfcherng/php-levenshtein-distance ^2.1
1 parent 0e92639 commit e8d9942

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"require": {
2727
"php": "^7.1.3",
28-
"jfcherng/php-levenshtein-distance": "^2.0",
28+
"jfcherng/php-levenshtein-distance": "^2.1",
2929
"jfcherng/php-mb-string": "^1.2"
3030
},
3131
"require-dev": {

src/Renderer/Html/AbstractHtml.php

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,6 @@ protected function renderChangedExtentLineLevel(MbString $mbFromLine, MbString $
237237
*/
238238
protected function renderChangedExtentCharLevel(MbString $mbFromLine, MbString $mbToLine): self
239239
{
240-
$fromEditPos = $mbFromLine->strlen();
241-
$toEditPos = $mbToLine->strlen();
242-
243240
// we prefer the char-level diff but if there is an exception like
244241
// "line too long", we fallback to line-level diff.
245242
try {
@@ -254,31 +251,25 @@ protected function renderChangedExtentCharLevel(MbString $mbFromLine, MbString $
254251
}
255252

256253
// start to render
257-
foreach ($editInfo['progresses'] as [$operation, $position,, $length]) {
254+
foreach ($editInfo['progresses'] as [$operation, $fromPos, $toPos, $length]) {
258255
switch ($operation) {
259256
// default never happens though
260257
default:
261258
// copy, render nothing
262259
case LD::OP_COPY:
263-
$fromEditPos -= $length;
264-
$toEditPos -= $length;
265260
break;
266261
// delete, render 'from'
267262
case LD::OP_DELETE:
268-
$fromEditPos -= $length;
269-
$mbFromLine->str_enclose_i(self::CLOSURES, $fromEditPos, $length);
263+
$mbFromLine->str_enclose_i(self::CLOSURES, $fromPos, $length);
270264
break;
271265
// insert, render 'to'
272266
case LD::OP_INSERT:
273-
$toEditPos -= $length;
274-
$mbToLine->str_enclose_i(self::CLOSURES, $toEditPos, $length);
267+
$mbToLine->str_enclose_i(self::CLOSURES, $toPos, $length);
275268
break;
276269
// replace, render both
277270
case LD::OP_REPLACE:
278-
$fromEditPos -= $length;
279-
$mbFromLine->str_enclose_i(self::CLOSURES, $fromEditPos, $length);
280-
$toEditPos -= $length;
281-
$mbToLine->str_enclose_i(self::CLOSURES, $toEditPos, $length);
271+
$mbFromLine->str_enclose_i(self::CLOSURES, $fromPos, $length);
272+
$mbToLine->str_enclose_i(self::CLOSURES, $toPos, $length);
282273
break;
283274
}
284275
}

0 commit comments

Comments
 (0)