Skip to content

Commit fb32453

Browse files
committed
Fix repeating class assignment of line header
Line headers of each equal or inserted line were given a class where it was supposed to be only the first line.
1 parent acbfd7d commit fb32453

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,12 @@ public function generateSkippedLines(): string
125125
*/
126126
public function generateLinesEqual(array $changes): string
127127
{
128-
$html = '';
129-
$headerClass = '';
128+
$html = '';
130129

131130
foreach ($changes['base']['lines'] as $lineNo => $line) {
132-
$fromLine = $changes['base']['offset'] + $lineNo + 1 + $this->lineOffset;
131+
$fromLine = $changes['base']['offset'] + $lineNo + 1 + $this->lineOffset;
132+
$headerClass = '';
133+
133134
if (!$lineNo && $this->lastDeleted !== null) {
134135
$headerClass = 'ChangeDelete';
135136
}
@@ -153,12 +154,12 @@ public function generateLinesEqual(array $changes): string
153154
*/
154155
public function generateLinesInsert(array $changes): string
155156
{
156-
$html = '';
157-
$headerClass = '';
157+
$html = '';
158158

159159
foreach ($changes['changed']['lines'] as $lineNo => $line) {
160160
$this->lineOffset++;
161-
$toLine = $changes['base']['offset'] + $this->lineOffset;
161+
$toLine = $changes['base']['offset'] + $this->lineOffset;
162+
$headerClass = '';
162163
if (!$lineNo && $this->lastDeleted !== null) {
163164
$headerClass = 'ChangeDelete';
164165
}

0 commit comments

Comments
 (0)