remove merge artifact
This commit is contained in:
parent
497c8aca5a
commit
cbd62fe6fb
1 changed files with 0 additions and 16 deletions
|
|
@ -122,20 +122,6 @@ export default class LineByLineRenderer {
|
|||
} else if (contextLines.length) {
|
||||
contextLines.forEach(line => {
|
||||
const { prefix, content } = renderUtils.deconstructLine(line.content, file.isCombined);
|
||||
lines.push(
|
||||
this.generateSingleLineHtml({
|
||||
type: renderUtils.CSSLineClass.CONTEXT,
|
||||
prefix: prefix,
|
||||
content: content,
|
||||
oldNumber: line.oldNumber,
|
||||
newNumber: line.newNumber,
|
||||
}),
|
||||
);
|
||||
});
|
||||
} else if (oldLines.length || newLines.length) {
|
||||
const { left, right } = this.processChangedLines(file.isCombined, oldLines, newLines);
|
||||
lines.push(...left);
|
||||
lines.push(...right);
|
||||
lines.push(
|
||||
this.generateSingleLineHtml(file, {
|
||||
type: renderUtils.CSSLineClass.CONTEXT,
|
||||
|
|
@ -219,7 +205,6 @@ export default class LineByLineRenderer {
|
|||
return doMatching ? matcher(oldLines, newLines) : [[oldLines, newLines]];
|
||||
}
|
||||
|
||||
|
||||
processChangedLines(file: DiffFile, isCombined: boolean, oldLines: DiffLine[], newLines: DiffLine[]): FileHtml {
|
||||
const fileHtml: FileHtml = {
|
||||
left: [],
|
||||
|
|
@ -307,7 +292,6 @@ export default class LineByLineRenderer {
|
|||
contentClass: 'd2h-code-line',
|
||||
prefix: line.prefix === ' ' ? ' ' : line.prefix,
|
||||
content: line.content,
|
||||
lineNumber: lineNumberHtml,
|
||||
line,
|
||||
file,
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue