commit a7a4f518791e1a477732175ea82847d073ded929
author Ben Rohlfs <brohlfs@google.com> Tue Aug 25 13:40:59 2020 +0200
committer Ben Rohlfs <brohlfs@google.com> Tue Aug 25 14:37:23 2020 +0200
tree 85c22da3879835ae418aa0433111bc71521d3791
parent a37743dc7d43f3c16954152e32ba3a742d87df54

Fix diff highlighting

Change-Id: Ie9de1677fa848c62ed01a092609219b3495f5609

polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.ts

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.ts b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.ts
index 74164a8..859cf10 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.ts
@@ -417,7 +417,7 @@
     offsetRight: number,
     row: string,
     i: number,
-    highlights: Highlights[] = []
+    highlights?: Highlights[]
   ): GrDiffLine {
     const line = new GrDiffLine(type);
     line.text = row;

polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.js

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.js b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.js
index 70c6f42..c1c344f 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor_test.js
@@ -16,6 +16,7 @@
  */
 
 import '../../../test/common-test-setup-karma.js';
+import 'lodash/lodash.js';
 import './gr-diff-processor.js';
 import {GrDiffLineType, FILE} from '../gr-diff/gr-diff-line.js';
 import {GrDiffGroup, GrDiffGroupType} from '../gr-diff/gr-diff-group.js';
@@ -537,6 +538,15 @@
           endIndex: 6,
         },
       ]);
+      const lines = element._linesFromRows(
+          GrDiffGroupType.BOTH, content, 0, highlights);
+      assert.equal(lines.length, 3);
+      assert.isTrue(lines[0].hasIntralineInfo);
+      assert.equal(lines[0].highlights.length, 1);
+      assert.isTrue(lines[1].hasIntralineInfo);
+      assert.equal(lines[1].highlights.length, 2);
+      assert.isTrue(lines[2].hasIntralineInfo);
+      assert.equal(lines[2].highlights.length, 1);
 
       content = [
         '        this._path = value.path;',
@@ -825,6 +835,7 @@
 
         assert.equal(result.length, rows.length);
         assert.equal(result[0].type, GrDiffLineType.ADD);
+        assert.notOk(result[0].hasIntralineInfo);
         assert.equal(result[0].afterNumber, startLineNum + 1);
         assert.notOk(result[0].beforeNumber);
         assert.equal(result[result.length - 1].afterNumber,
@@ -836,6 +847,7 @@
 
         assert.equal(result.length, rows.length);
         assert.equal(result[0].type, GrDiffLineType.REMOVE);
+        assert.notOk(result[0].hasIntralineInfo);
         assert.equal(result[0].beforeNumber, startLineNum + 1);
         assert.notOk(result[0].afterNumber);
         assert.equal(result[result.length - 1].beforeNumber,