Skip to content

Commit 598f0f4

Browse files
jfcherngjfcherng
committed
fix: Combined::renderArray isn't working properly
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
1 parent ccc178b commit 598f0f4

File tree

4 files changed

+66
-30
lines changed

4 files changed

+66
-30
lines changed

‎src/Renderer/AbstractRenderer.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ abstract class AbstractRenderer implements RendererInterface
4141
*/
4242
protected $t;
4343

44+
/**
45+
* If the input "changes" have `<ins>...</ins>` or `<del>...</del>`,
46+
* which means they have been processed, then `false`. Otherwise, `true`.
47+
*
48+
* @var bool
49+
*/
50+
protected $changesAreRaw = true;
51+
4452
/**
4553
* @var array array of the default options that apply to this renderer
4654
*/
@@ -168,6 +176,7 @@ abstract public function getResultForIdenticalsDefault(): string;
168176
*/
169177
final public function render(Differ $differ): string
170178
{
179+
$this->changesAreRaw = true;
171180
// the "no difference" situation may happen frequently
172181
return $differ->getOldNewComparison() === 0
173182
? $this->getResultForIdenticals()
@@ -179,6 +188,8 @@ final public function render(Differ $differ): string
179188
*/
180189
final public function renderArray(array $differArray): string
181190
{
191+
$this->changesAreRaw = false;
192+
182193
return $this->renderArrayWorker($differArray);
183194
}
184195

‎src/Renderer/Html/Combined.php‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,24 @@ protected function renderTableHunks(array $hunks): string
110110
*/
111111
protected function renderTableBlock(array $block): string
112112
{
113-
static $callbacks = [
114-
SequenceMatcher::OP_EQ => 'renderTableBlockEqual',
115-
SequenceMatcher::OP_INS => 'renderTableBlockInsert',
116-
SequenceMatcher::OP_DEL => 'renderTableBlockDelete',
117-
SequenceMatcher::OP_REP => 'renderTableBlockReplace',
118-
];
113+
switch ($block['tag']) {
114+
case SequenceMatcher::OP_EQ:
115+
$content = $this->renderTableBlockEqual($block);
116+
break;
117+
case SequenceMatcher::OP_INS:
118+
$content = $this->renderTableBlockInsert($block);
119+
break;
120+
case SequenceMatcher::OP_DEL:
121+
$content = $this->renderTableBlockDelete($block);
122+
break;
123+
case SequenceMatcher::OP_REP:
124+
$content = $this->renderTableBlockReplace($block);
125+
break;
126+
default:
127+
$content = '';
128+
}
119129

120-
return
121-
'<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' .
122-
$this->{$callbacks[$block['tag']]}($block) .
123-
'</tbody>';
130+
return '<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' . $content . '</tbody>';
124131
}
125132

126133
/**
@@ -485,6 +492,10 @@ function (array $matches) use (&$parts, $part, $ld, $rd): string {
485492
*/
486493
protected function customFormatLines(array $lines, int $op): array
487494
{
495+
if (!$this->changesAreRaw) {
496+
return $lines;
497+
}
498+
488499
static $closureMap = [
489500
SequenceMatcher::OP_DEL => RendererConstant::HTML_CLOSURES_DEL,
490501
SequenceMatcher::OP_INS => RendererConstant::HTML_CLOSURES_INS,

‎src/Renderer/Html/Inline.php‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,24 @@ protected function renderTableHunks(array $hunks): string
112112
*/
113113
protected function renderTableBlock(array $block): string
114114
{
115-
static $callbacks = [
116-
SequenceMatcher::OP_EQ => 'renderTableBlockEqual',
117-
SequenceMatcher::OP_INS => 'renderTableBlockInsert',
118-
SequenceMatcher::OP_DEL => 'renderTableBlockDelete',
119-
SequenceMatcher::OP_REP => 'renderTableBlockReplace',
120-
];
115+
switch ($block['tag']) {
116+
case SequenceMatcher::OP_EQ:
117+
$content = $this->renderTableBlockEqual($block);
118+
break;
119+
case SequenceMatcher::OP_INS:
120+
$content = $this->renderTableBlockInsert($block);
121+
break;
122+
case SequenceMatcher::OP_DEL:
123+
$content = $this->renderTableBlockDelete($block);
124+
break;
125+
case SequenceMatcher::OP_REP:
126+
$content = $this->renderTableBlockReplace($block);
127+
break;
128+
default:
129+
$content = '';
130+
}
121131

122-
return
123-
'<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' .
124-
$this->{$callbacks[$block['tag']]}($block) .
125-
'</tbody>';
132+
return '<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' . $content . '</tbody>';
126133
}
127134

128135
/**

‎src/Renderer/Html/SideBySide.php‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,24 @@ protected function renderTableHunks(array $hunks): string
104104
*/
105105
protected function renderTableBlock(array $block): string
106106
{
107-
static $callbacks = [
108-
SequenceMatcher::OP_EQ => 'renderTableBlockEqual',
109-
SequenceMatcher::OP_INS => 'renderTableBlockInsert',
110-
SequenceMatcher::OP_DEL => 'renderTableBlockDelete',
111-
SequenceMatcher::OP_REP => 'renderTableBlockReplace',
112-
];
107+
switch ($block['tag']) {
108+
case SequenceMatcher::OP_EQ:
109+
$content = $this->renderTableBlockEqual($block);
110+
break;
111+
case SequenceMatcher::OP_INS:
112+
$content = $this->renderTableBlockInsert($block);
113+
break;
114+
case SequenceMatcher::OP_DEL:
115+
$content = $this->renderTableBlockDelete($block);
116+
break;
117+
case SequenceMatcher::OP_REP:
118+
$content = $this->renderTableBlockReplace($block);
119+
break;
120+
default:
121+
$content = '';
122+
}
113123

114-
return
115-
'<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' .
116-
$this->{$callbacks[$block['tag']]}($block) .
117-
'</tbody>';
124+
return '<tbody class="change change-' . self::TAG_CLASS_MAP[$block['tag']] . '">' . $content . '</tbody>';
118125
}
119126

120127
/**

0 commit comments

Comments
 (0)