luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove merge artifact

Browse source
This commit is contained in:
Lordfirespeed 2023-03-15 04:46:44 +00:00
parent 497c8aca5a
commit cbd62fe6fb
No known key found for this signature in database
GPG key ID: 9C01965EC9DE6690
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/line-by-line-renderer.ts
View file

@ -122,20 +122,6 @@ export default class LineByLineRenderer {
} else if (contextLines.length) { } else if (contextLines.length) {
contextLines.forEach(line => { contextLines.forEach(line => {
const { prefix, content } = renderUtils.deconstructLine(line.content, file.isCombined); 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( lines.push(
this.generateSingleLineHtml(file, { this.generateSingleLineHtml(file, {
type: renderUtils.CSSLineClass.CONTEXT, type: renderUtils.CSSLineClass.CONTEXT,
@ -219,7 +205,6 @@ export default class LineByLineRenderer {
return doMatching ? matcher(oldLines, newLines) : [[oldLines, newLines]]; return doMatching ? matcher(oldLines, newLines) : [[oldLines, newLines]];
} }
processChangedLines(file: DiffFile, isCombined: boolean, oldLines: DiffLine[], newLines: DiffLine[]): FileHtml { processChangedLines(file: DiffFile, isCombined: boolean, oldLines: DiffLine[], newLines: DiffLine[]): FileHtml {
const fileHtml: FileHtml = { const fileHtml: FileHtml = {
left: [], left: [],
@ -307,7 +292,6 @@ export default class LineByLineRenderer {
contentClass: 'd2h-code-line', contentClass: 'd2h-code-line',
prefix: line.prefix === ' ' ? ' ' : line.prefix, prefix: line.prefix === ' ' ? ' ' : line.prefix,
content: line.content, content: line.content,
lineNumber: lineNumberHtml,
line, line,
file, file,
}); });