Skip to content

Commit e39d674

Browse files
jfcherngjfcherng
committed
Tidy codes
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
1 parent d643094 commit e39d674

File tree

10 files changed

+137
-196
lines changed

10 files changed

+137
-196
lines changed

‎src/Renderer/Html/AbstractHtml.php‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -66,62 +66,47 @@ public function getChanges(Differ $differ): array
6666

6767
foreach ($differ->getGroupedOpcodes() as $hunk) {
6868
$change = [];
69-
$lastOp = SequenceMatcher::OP_NOP;
70-
$lastBlock = 0;
7169

7270
foreach ($hunk as [$op, $i1, $i2, $j1, $j2]) {
71+
$change[] = $this->getDefaultBlock($op, $i1, $j1);
72+
$block = &$change[\count($change) - 1];
73+
7374
// if there are same amount of lines replaced
7475
// we can render the inner detailed changes with corresponding lines
7576
// @todo or use LineRenderer to do the job regardless different line counts?
7677
if ($op === SequenceMatcher::OP_REP && $i2 - $i1 === $j2 - $j1) {
77-
for ($k = 0; $k < $i2 - $i1; ++$k) {
78+
for ($k = $i2 - $i1 - 1; $k >= 0; --$k) {
7879
$this->renderChangedExtent($lineRenderer, $old[$i1 + $k], $new[$j1 + $k]);
7980
}
8081
}
8182

82-
if ($op !== $lastOp) {
83-
$change[] = $this->getDefaultBlock($op, $i1, $j1);
84-
$lastBlock = \count($change) - 1;
85-
}
86-
87-
$lastOp = $op;
83+
$oldLines = $this->formatLines(\array_slice($old, $i1, $i2 - $i1));
84+
$newLines = $this->formatLines(\array_slice($new, $j1, $j2 - $j1));
8885

8986
if ($op === SequenceMatcher::OP_EQ) {
90-
// note that although we are in a OP_EQ situation,
91-
// the old and the new may not be exactly the same
92-
// because of ignoreCase, ignoreWhitespace, etc
93-
$lines = \array_slice($old, $i1, $i2 - $i1);
94-
$change[$lastBlock]['old']['lines'] = $this->formatLines($lines);
95-
$lines = \array_slice($new, $j1, $j2 - $j1);
96-
$change[$lastBlock]['new']['lines'] = $this->formatLines($lines);
87+
$block['old']['lines'] = $oldLines;
88+
$block['new']['lines'] = $newLines;
9789

9890
continue;
9991
}
10092

10193
if ($op & (SequenceMatcher::OP_REP | SequenceMatcher::OP_DEL)) {
102-
$lines = \array_slice($old, $i1, $i2 - $i1);
103-
$lines = $this->formatLines($lines);
104-
$lines = \str_replace(
94+
$block['old']['lines'] = \str_replace(
10595
RendererConstant::HTML_CLOSURES,
10696
RendererConstant::HTML_CLOSURES_DEL,
107-
$lines
97+
$oldLines
10898
);
109-
110-
$change[$lastBlock]['old']['lines'] = $lines;
11199
}
112100

113101
if ($op & (SequenceMatcher::OP_REP | SequenceMatcher::OP_INS)) {
114-
$lines = \array_slice($new, $j1, $j2 - $j1);
115-
$lines = $this->formatLines($lines);
116-
$lines = \str_replace(
102+
$block['new']['lines'] = \str_replace(
117103
RendererConstant::HTML_CLOSURES,
118104
RendererConstant::HTML_CLOSURES_INS,
119-
$lines
105+
$newLines
120106
);
121-
122-
$change[$lastBlock]['new']['lines'] = $lines;
123107
}
124108
}
109+
unset($block);
125110

126111
$changes[] = $change;
127112
}
@@ -162,10 +147,8 @@ abstract protected function redererChanges(array $changes): string;
162147
* @param AbstractLineRenderer $lineRenderer the line renderer
163148
* @param string $old the old line
164149
* @param string $new the new line
165-
*
166-
* @return static
167150
*/
168-
protected function renderChangedExtent(AbstractLineRenderer $lineRenderer, string &$old, string &$new): self
151+
protected function renderChangedExtent(AbstractLineRenderer $lineRenderer, string &$old, string &$new): void
169152
{
170153
static $mbOld, $mbNew;
171154

@@ -179,8 +162,6 @@ protected function renderChangedExtent(AbstractLineRenderer $lineRenderer, strin
179162

180163
$old = $mbOld->get();
181164
$new = $mbNew->get();
182-
183-
return $this;
184165
}
185166

186167
/**

‎src/Renderer/Html/Combined.php‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ protected function renderTableBlockEqual(array $block): string
127127
// the old and the new may not be exactly the same
128128
// because of ignoreCase, ignoreWhitespace, etc
129129
foreach ($block['new']['lines'] as $newLine) {
130-
// but in this renderer, we can only pick either the old or the new to show
130+
// we could only pick either the old or the new to show
131+
// here we pick the new one to let the user know what it is now
131132
$html .=
132133
'<tr data-type="=">' .
133134
'<td class="new">' . $newLine . '</td>' .
@@ -235,16 +236,13 @@ protected function renderTableBlockReplace(array $block): string
235236
protected function mergeReplaceLines(string $oldLine, string $newLine): ?string
236237
{
237238
$delParts = $this->analyzeClosureParts(
238-
RendererConstant::HTML_CLOSURES_DEL[0],
239-
RendererConstant::HTML_CLOSURES_DEL[1],
240239
$oldLine,
240+
RendererConstant::HTML_CLOSURES_DEL,
241241
SequenceMatcher::OP_DEL
242242
);
243-
244243
$insParts = $this->analyzeClosureParts(
245-
RendererConstant::HTML_CLOSURES_INS[0],
246-
RendererConstant::HTML_CLOSURES_INS[1],
247244
$newLine,
245+
RendererConstant::HTML_CLOSURES_INS,
248246
SequenceMatcher::OP_INS
249247
);
250248

@@ -298,15 +296,16 @@ protected function mergeReplaceLines(string $oldLine, string $newLine): ?string
298296
* extract informations for "<ins>part 1</ins>" and "<ins>part 2</ins>"
299297
* from "Hello <ins>part 1</ins>SOME OTHER TEXT<ins>part 2</ins> World"
300298
*
301-
* @param string $ld the left delimiter
302-
* @param string $rd the right delimiter
303-
* @param string $line the line
304-
* @param int $type the line type
299+
* @param string $line the line
300+
* @param string[] $closures the closures
301+
* @param int $type the type
305302
*
306303
* @return array[] the closure informations
307304
*/
308-
protected function analyzeClosureParts(string $ld, string $rd, string $line, int $type): array
305+
protected function analyzeClosureParts(string $line, array $closures, int $type): array
309306
{
307+
[$ld, $rd] = $closures;
308+
310309
$ldLength = \strlen($ld);
311310
$rdLength = \strlen($rd);
312311

@@ -355,19 +354,15 @@ protected function analyzeClosureParts(string $ld, string $rd, string $line, int
355354
*/
356355
protected function markReplaceBlockDiff(array $oldBlock, array $newBlock): array
357356
{
358-
static $isInitiated = false, $mbOld, $mbNew, $lineRenderer;
359-
360-
if (!$isInitiated) {
361-
$isInitiated = true;
362-
363-
$mbOld = new MbString();
364-
$mbNew = new MbString();
365-
$lineRenderer = LineRendererFactory::make(
366-
$this->options['detailLevel'],
367-
[], /** @todo is it possible to get the differOptions here? */
368-
$this->options
369-
);
370-
}
357+
static $mbOld, $mbNew, $lineRenderer;
358+
359+
$mbOld = $mbOld ?? new MbString();
360+
$mbNew = $mbNew ?? new MbString();
361+
$lineRenderer = $lineRenderer ?? LineRendererFactory::make(
362+
$this->options['detailLevel'],
363+
[], /** @todo is it possible to get the differOptions here? */
364+
$this->options
365+
);
371366

372367
$mbOld->set(\implode("\n", $oldBlock));
373368
$mbNew->set(\implode("\n", $newBlock));
@@ -406,7 +401,7 @@ protected function isLinesMergeable(string $oldLine, string $newLine, string $cl
406401

407402
$sumLength = \strlen($oldLine) + \strlen($newLine);
408403

409-
/** @var float the changed ratio, 0 <= range < 1 */
404+
/** @var float the changed ratio, 0 <= value < 1 */
410405
$changedRatio = ($sumLength - (\strlen($cleanLine) << 1)) / ($sumLength + 1);
411406

412407
return $changedRatio <= $this->options['mergeThreshold'];
@@ -422,19 +417,21 @@ protected function isLinesMergeable(string $oldLine, string $newLine, string $cl
422417
*/
423418
protected function revisePartsForBoundaryNewlines(array &$parts, array $closures): void
424419
{
425-
$closureRegexL = \preg_quote($closures[0], '/');
426-
$closureRegexR = \preg_quote($closures[1], '/');
420+
[$ld, $rd] = $closures;
421+
422+
$ldRegex = \preg_quote($ld, '/');
423+
$rdRegex = \preg_quote($rd, '/');
427424

428425
for ($i = \count($parts) - 1; $i >= 0; --$i) {
429426
$part = &$parts[$i];
430427

431428
// deal with leading newlines
432429
$part['content'] = \preg_replace_callback(
433-
"/(?P<closure>{$closureRegexL})(?P<nl>[\r\n]++)/u",
434-
function (array $matches) use (&$parts, $part, $closures): string {
430+
"/(?P<closure>{$ldRegex})(?P<nl>[\r\n]++)/u",
431+
function (array $matches) use (&$parts, $part, $ld, $rd): string {
435432
// add a new part for the extracted newlines
436433
$part['order'] = -1;
437-
$part['content'] = "{$closures[0]}{$matches['nl']}{$closures[1]}";
434+
$part['content'] = "{$ld}{$matches['nl']}{$rd}";
438435
$parts[] = $part;
439436

440437
return $matches['closure'];
@@ -444,11 +441,11 @@ function (array $matches) use (&$parts, $part, $closures): string {
444441

445442
// deal with trailing newlines
446443
$part['content'] = \preg_replace_callback(
447-
"/(?P<nl>[\r\n]++)(?P<closure>{$closureRegexR})/u",
448-
function (array $matches) use (&$parts, $part, $closures): string {
444+
"/(?P<nl>[\r\n]++)(?P<closure>{$rdRegex})/u",
445+
function (array $matches) use (&$parts, $part, $ld, $rd): string {
449446
// add a new part for the extracted newlines
450447
$part['order'] = 1;
451-
$part['content'] = "{$closures[0]}{$matches['nl']}{$closures[1]}";
448+
$part['content'] = "{$ld}{$matches['nl']}{$rd}";
452449
$parts[] = $part;
453450

454451
return $matches['closure'];

‎src/Renderer/Html/Inline.php‎

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ protected function renderTableBlockEqual(array $block): string
134134
// the old and the new may not be exactly the same
135135
// because of ignoreCase, ignoreWhitespace, etc
136136
foreach ($block['new']['lines'] as $no => $newLine) {
137-
// but in this renderer, we can only pick either the old or the new to show
137+
// we could only pick either the old or the new to show
138+
// here we pick the new one to let the user know what it is now
138139
$oldLineNum = $block['old']['offset'] + $no + 1;
139140
$newLineNum = $block['new']['offset'] + $no + 1;
140141

@@ -202,31 +203,7 @@ protected function renderTableBlockDelete(array $block): string
202203
*/
203204
protected function renderTableBlockReplace(array $block): string
204205
{
205-
$html = '';
206-
207-
foreach ($block['old']['lines'] as $no => $oldLine) {
208-
$oldLineNum = $block['old']['offset'] + $no + 1;
209-
210-
$html .=
211-
'<tr data-type="-">' .
212-
$this->renderLineNumberColumns($oldLineNum, null) .
213-
'<th class="sign del">-</th>' .
214-
'<td class="old">' . $oldLine . '</td>' .
215-
'</tr>';
216-
}
217-
218-
foreach ($block['new']['lines'] as $no => $newLine) {
219-
$newLineNum = $block['new']['offset'] + $no + 1;
220-
221-
$html .=
222-
'<tr data-type="+">' .
223-
$this->renderLineNumberColumns(null, $newLineNum) .
224-
'<th class="sign ins">+</th>' .
225-
'<td class="new">' . $newLine . '</td>' .
226-
'</tr>';
227-
}
228-
229-
return $html;
206+
return $this->renderTableBlockDelete($block) . $this->renderTableBlockInsert($block);
230207
}
231208

232209
/**

‎src/Renderer/Html/LineRenderer/Char.php‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,12 @@ public function render(MbString $mbOld, MbString $mbNew): LineRendererInterface
2222

2323
// reversely iterate hunk
2424
foreach (ReverseIterator::fromArray($hunk) as [$op, $i1, $i2, $j1, $j2]) {
25-
switch ($op) {
26-
case SequenceMatcher::OP_DEL:
27-
$mbOld->str_enclose_i(RendererConstant::HTML_CLOSURES, $i1, $i2 - $i1);
28-
29-
break;
30-
case SequenceMatcher::OP_INS:
31-
$mbNew->str_enclose_i(RendererConstant::HTML_CLOSURES, $j1, $j2 - $j1);
32-
33-
break;
34-
case SequenceMatcher::OP_REP:
35-
$mbOld->str_enclose_i(RendererConstant::HTML_CLOSURES, $i1, $i2 - $i1);
36-
$mbNew->str_enclose_i(RendererConstant::HTML_CLOSURES, $j1, $j2 - $j1);
25+
if ($op & (SequenceMatcher::OP_REP | SequenceMatcher::OP_DEL)) {
26+
$mbOld->str_enclose_i(RendererConstant::HTML_CLOSURES, $i1, $i2 - $i1);
27+
}
3728

38-
break;
39-
default:
40-
continue 2;
29+
if ($op & (SequenceMatcher::OP_REP | SequenceMatcher::OP_INS)) {
30+
$mbNew->str_enclose_i(RendererConstant::HTML_CLOSURES, $j1, $j2 - $j1);
4131
}
4232
}
4333

‎src/Renderer/Html/LineRenderer/Word.php‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,14 @@ public function render(MbString $mbOld, MbString $mbNew): LineRendererInterface
2828

2929
// reversely iterate hunk
3030
foreach (ReverseIterator::fromArray($hunk) as [$op, $i1, $i2, $j1, $j2]) {
31-
switch ($op) {
32-
case SequenceMatcher::OP_DEL:
33-
$oldWords[$i1] = RendererConstant::HTML_CLOSURES[0] . $oldWords[$i1];
34-
$oldWords[$i2 - 1] .= RendererConstant::HTML_CLOSURES[1];
35-
36-
break;
37-
case SequenceMatcher::OP_INS:
38-
$newWords[$j1] = RendererConstant::HTML_CLOSURES[0] . $newWords[$j1];
39-
$newWords[$j2 - 1] .= RendererConstant::HTML_CLOSURES[1];
40-
41-
break;
42-
case SequenceMatcher::OP_REP:
43-
$oldWords[$i1] = RendererConstant::HTML_CLOSURES[0] . $oldWords[$i1];
44-
$oldWords[$i2 - 1] .= RendererConstant::HTML_CLOSURES[1];
45-
$newWords[$j1] = RendererConstant::HTML_CLOSURES[0] . $newWords[$j1];
46-
$newWords[$j2 - 1] .= RendererConstant::HTML_CLOSURES[1];
47-
48-
break;
49-
default:
50-
continue 2;
31+
if ($op & (SequenceMatcher::OP_REP | SequenceMatcher::OP_DEL)) {
32+
$oldWords[$i1] = RendererConstant::HTML_CLOSURES[0] . $oldWords[$i1];
33+
$oldWords[$i2 - 1] .= RendererConstant::HTML_CLOSURES[1];
34+
}
35+
36+
if ($op & (SequenceMatcher::OP_REP | SequenceMatcher::OP_INS)) {
37+
$newWords[$j1] = RendererConstant::HTML_CLOSURES[0] . $newWords[$j1];
38+
$newWords[$j2 - 1] .= RendererConstant::HTML_CLOSURES[1];
5139
}
5240
}
5341

‎src/Renderer/Html/SideBySide.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,6 @@ protected function renderTableBlockEqual(array $block): string
122122
{
123123
$html = '';
124124

125-
// note that although we are in a OP_EQ situation,
126-
// the old and the new may not be exactly the same
127-
// because of ignoreCase, ignoreWhitespace, etc
128125
foreach ($block['new']['lines'] as $no => $newLine) {
129126
$oldLine = $block['old']['lines'][$no];
130127

‎src/Renderer/RendererConstant.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ final class RendererConstant
3131
const HTML_CLOSURES = ["\u{fcffc}\u{ff2fb}", "\u{fff41}\u{fcffc}"];
3232

3333
/**
34-
* Closures that are used to enclose inserted chars in output HTML.
34+
* Closures that are used to enclose deleted chars in output HTML.
3535
*
3636
* @var string[]
3737
*/
38-
const HTML_CLOSURES_INS = ['<ins>', '</ins>'];
38+
const HTML_CLOSURES_DEL = ['<del>', '</del>'];
3939

4040
/**
41-
* Closures that are used to enclose deleted chars in output HTML.
41+
* Closures that are used to enclose inserted chars in output HTML.
4242
*
4343
* @var string[]
4444
*/
45-
const HTML_CLOSURES_DEL = ['<del>', '</del>'];
45+
const HTML_CLOSURES_INS = ['<ins>', '</ins>'];
4646

4747
/**
4848
* The delimiter to be used as the glue in string/array functions.

‎src/Renderer/Text/AbstractText.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ abstract class AbstractText extends AbstractRenderer
1717
*/
1818
const IS_TEXT_RENDERER = true;
1919

20-
/**
21-
* @var int indicating using the old as the source text
22-
*/
23-
const OLD_AS_SOURCE = 1;
24-
25-
/**
26-
* @var int indicating using the new as the source text
27-
*/
28-
const NEW_AS_SOURCE = 2;
29-
3020
/**
3121
* @var string the diff output representing there is no EOL at EOF in the GNU diff tool
3222
*/

0 commit comments

Comments
 (0)