Fixes for match lines in parallel view.

85507b25 · Fatih Acet · 89875aff · 85507b25
Commit 85507b25 authored Jul 31, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

app/assets/javascripts/merge_conflict_data_provider.js.es6 app/assets/javascripts/merge_conflict_data_provider.js.es6 +4 -2

No files found.
--- a/app/assets/javascripts/merge_conflict_data_provider.js.es6
+++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6
@@ -67,8 +67,10 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
            }
          }
          else {
-            file.parallelLines.left.push({ lineType: 'context', lineNumber: line.old_line, richText: line.rich_text });
+            const lineType = line.type || 'context';
-            file.parallelLines.right.push({ lineType: 'context', lineNumber: line.new_line, richText: line.rich_text });
+            const hasMatch = line.type === 'match';
+            file.parallelLines.left.push({ lineType, hasMatch, lineNumber: line.old_line, richText: line.rich_text });
+            file.parallelLines.right.push({ lineType, hasMatch, lineNumber: line.new_line, richText: line.rich_text });
          }
        });
      });