Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/changes/ChangesView.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/changes/ChangesView.js b/third_party/WebKit/Source/devtools/front_end/changes/ChangesView.js |
| index b4078e735bfa45c160215ea02b0e0de998de165d..ba8f2795ce36ee1afedb594ec5af79a4676ac31a 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/changes/ChangesView.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/changes/ChangesView.js |
| @@ -132,24 +132,31 @@ Changes.ChangesView = class extends UI.VBox { |
| var currentLineNumber = 0; |
| var baselineLineNumber = 0; |
| var paddingLines = 3; |
| + var originalLines = []; |
| + var currentLines = []; |
| for (var i = 0; i < diff.length; ++i) { |
| var token = diff[i]; |
| switch (token[0]) { |
| case Diff.Diff.Operation.Equal: |
| this._diffRows.pushAll(createEqualRows(token[1], i === 0, i === diff.length - 1)); |
| + originalLines.pushAll(token[1]); |
| + currentLines.pushAll(token[1]); |
| break; |
| case Diff.Diff.Operation.Insert: |
| for (var line of token[1]) |
| this._diffRows.push(createRow(line, Changes.ChangesView.RowType.Addition)); |
| insertions += token[1].length; |
| + currentLines.pushAll(token[1]); |
| break; |
| case Diff.Diff.Operation.Delete: |
| deletions += token[1].length; |
| + originalLines.pushAll(token[1]); |
| if (diff[i + 1] && diff[i + 1][0] === Diff.Diff.Operation.Insert) { |
| i++; |
| this._diffRows.pushAll(createModifyRows(token[1].join('\n'), diff[i][1].join('\n'))); |
| insertions += diff[i][1].length; |
| + currentLines.pushAll(diff[i][1]); |
| } else { |
| for (var line of token[1]) |
| this._diffRows.push(createRow(line, Changes.ChangesView.RowType.Deletion)); |
| @@ -168,7 +175,14 @@ Changes.ChangesView = class extends UI.VBox { |
| this._editor.operation(() => { |
| this._editor.showWidget(); |
| - this._editor.setHighlightMode({name: 'devtools-diff', rows: this._diffRows}); |
| + this._editor.setHighlightMode({ |
| + name: 'devtools-diff', |
| + rows: this._diffRows, |
|
lushnikov
2017/04/03 23:11:19
diffRows
|
| + mimeType: Bindings.NetworkProject.uiSourceCodeMimeType( |
| + /** @type {!Workspace.UISourceCode} */ (this._selectedUISourceCode)), |
| + baselineLines: originalLines, |
| + currentLines: currentLines |
| + }); |
| this._editor.setText(this._diffRows.map(row => row.content.map(t => t.text).join('')).join('\n')); |
| this._editor.setLineNumberFormatter(this._lineFormatter.bind(this)); |
| }); |