commit 53098ae4fd39583e6ec16c0b4e4d2c0de3b751f9
author Ole Rehmsen <oler@google.com> Thu Apr 18 17:20:57 2019 +0200
committer Ole Rehmsen <oler@google.com> Tue Apr 30 15:45:01 2019 +0200
tree 460aaa267ce5ab0079f9a19f4cfe502b883c2dc2
parent 3ccb219f9fb65445036df625a34a632dfe6facc1

Also split chunks with ignored whitespace diff

Bug: Issue 1062
Change-Id: If80aa5dd38c015ec765d9982ef2a4c0ce6fb8c28

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

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.js b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.js
index 6848d1b..fb4aa62 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-processor/gr-diff-processor.js
@@ -442,7 +442,7 @@
 
       for (const chunk of chunks) {
         // If it isn't a common chunk, append it as-is and update line numbers.
-        if (!chunk.ab) {
+        if (!chunk.ab && !chunk.common) {
           if (chunk.a) {
             leftLineNum += chunk.a.length;
           }
@@ -453,13 +453,25 @@
           continue;
         }
 
-        const numLines = chunk.ab.length;
+        if (chunk.common && chunk.a.length != chunk.b.length) {
+          throw new Error(
+            'DiffContent with common=true must always have equal length');
+        }
+        const numLines = chunk.ab ? chunk.ab.length : chunk.a.length;
         const chunkEnds = this._findChunkEndsAtKeyLocations(
             numLines, leftLineNum, rightLineNum);
         leftLineNum += numLines;
         rightLineNum += numLines;
-        result.push(...this._splitAtChunkEnds(chunk.ab, chunkEnds)
-            .map(lines => Object.assign({}, chunk, {ab: lines})));
+
+        if (chunk.ab) {
+          result.push(...this._splitAtChunkEnds(chunk.ab, chunkEnds)
+              .map(lines => Object.assign({}, chunk, {ab: lines})));
+        } else if (chunk.common) {
+          const aChunks = this._splitAtChunkEnds(chunk.a, chunkEnds);
+          const bChunks = this._splitAtChunkEnds(chunk.b, chunkEnds);
+          result.push(...aChunks.map((lines, i) =>
+              Object.assign({}, chunk, {a: lines, b: bChunks[i]})));
+        }
       }
 
       return result;