From e675f9561cf5e7a51c80bab548c738ca77b0d8bc Mon Sep 17 00:00:00 2001 From: Simon Knox Date: Sat, 27 Jul 2019 08:12:59 +1000 Subject: Readd missing line_code to parallel lines --- app/assets/javascripts/diffs/store/utils.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index c7d77ba54ea..000537c86a7 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -197,12 +197,22 @@ export function trimFirstCharOfLineContent(line = {}) { return parsedLine; } +function getLineCode({ left, right }, index) { + if (left && left.line_code) { + return left.line_code; + } else if (right && right.line_code) { + return right.line_code; + } + return index; +} + export function parallelizeDiffLines(highlightedDiffLines = []) { let i = 0; const lines = []; let freeRightIndex = null; - highlightedDiffLines.forEach(line => { + highlightedDiffLines.forEach((line, index) => { + line.line_code = getLineCode(line, index); if (line.removed) { lines.push({ left: line, -- cgit v1.2.1