DevTools: Add syntax highlighting to ChangesView

third_party/WebKit/Source/devtools/front_end/changes/ChangesHighlighter.js

Index: third_party/WebKit/Source/devtools/front_end/changes/ChangesHighlighter.js
diff --git a/third_party/WebKit/Source/devtools/front_end/changes/ChangesHighlighter.js b/third_party/WebKit/Source/devtools/front_end/changes/ChangesHighlighter.js
index 4a7a0415f3f39e74977a2cc3bde9e332a1aed5ad..9c0cc0d28fe435c03ab53753c31d3f6fc21b6820 100644
--- a/third_party/WebKit/Source/devtools/front_end/changes/ChangesHighlighter.js
+++ b/third_party/WebKit/Source/devtools/front_end/changes/ChangesHighlighter.js
@@ -4,22 +4,73 @@
 
 /**
  * @param {!Object} config
- * @param {{rows: !Array<!Changes.ChangesView.Row>}} parserConfig
+ * @param {{rows: !Array<!Changes.ChangesView.Row>, baselineLines: !Array<string>, currentLines: !Array<string>, mimeType: string}} parserConfig
  * @return {{
  *  startState: function():!Changes.ChangesHighlighter.DiffState,
  *  token: function({next: function()}, !Changes.ChangesHighlighter.DiffState):string,
  *  blankLine: function(!Changes.ChangesHighlighter.DiffState):string,
+ *  copyState: function(!Changes.ChangesHighlighter.DiffState):Changes.ChangesHighlighter.DiffState
  * }}
  */
 Changes.ChangesHighlighter = function(config, parserConfig) {
   var rows = parserConfig.rows;
+  var baselineLines = parserConfig.baselineLines;
+  var currentLines = parserConfig.currentLines;
+  var innerMode = CodeMirror.getMode({}, parserConfig.mimeType);
+
+  /**
+   * @param {!Changes.ChangesHighlighter.DiffState} state
+   * @param {number} baselineLineNumber
+   * @param {number} currentLineNumber
+   */
+  function fastForward(state, baselineLineNumber, currentLineNumber) {
+    if (baselineLineNumber > state.baselineLineNumber) {
+      fastForwardState(state.baselineState, state.baselineLineNumber, baselineLineNumber, baselineLines);
+      state.baselineLineNumber = baselineLineNumber;
+    }
+    if (currentLineNumber > state.currentLineNumber) {
+      fastForwardState(state.currentState, state.currentLineNumber, currentLineNumber, currentLines);
+      state.currentLineNumber = currentLineNumber;
+    }
+  }
+
+  /**
+   * @param {!Object} state
+   * @param {number} from
+   * @param {number} to
+   * @param {!Array<string>} lines
+   */
+  function fastForwardState(state, from, to, lines) {
+    var lineNumber = from;
+    while (lineNumber < to && lineNumber < lines.length) {
+      var stream = new CodeMirror.StringStream(lines[lineNumber]);
+      if (stream.eol() && innerMode.blankLine)
+        innerMode.blankLine(state);
+      while (!stream.eol()) {
+        innerMode.token(stream, state);
+        stream.start = stream.pos;
+      }
+      lineNumber++;
+    }
+  }
 
   return {
     /**
      * @return {!Changes.ChangesHighlighter.DiffState}
      */
     startState: function() {
-      return {lineNumber: 0, index: 0};
+      return {
+        lineNumber: 0,
+        diffTokenIndex: 0,
+        currentLineNumber: 0,
+        baselineLineNumber: 0,
+        currentState: CodeMirror.startState(innerMode),
+        baselineState: CodeMirror.startState(innerMode),
+        syntaxPos: 0,
+        diffPos: 0,
+        syntaxStyle: '',
+        diffStyle: ''
+      };
     },
 
     /**
@@ -33,15 +84,42 @@ Changes.ChangesHighlighter = function(config, parserConfig) {
         stream.next();
         return '';
       }
+      fastForward(state, row.baselineLineNumber - 1, row.currentLineNumber - 1);
       var classes = '';
-      if (state.index === 0)
+      if (stream.pos === 0)
         classes += ' line-background-' + row.type + ' line-' + row.type;
-      stream.pos += row.content[state.index].text.length;
-      classes += ' ' + row.content[state.index].className;
-      state.index++;
-      if (state.index >= row.content.length) {
+
+      if (state.diffPos <= state.syntaxPos) {
+        state.diffPos += row.content[state.diffTokenIndex].text.length;
+        state.diffStyle = row.content[state.diffTokenIndex].className;
+        state.diffTokenIndex++;
+      }
+
+      if (state.diffPos >= state.syntaxPos) {
+        if (row.type === Changes.ChangesView.RowType.Deletion || row.type === Changes.ChangesView.RowType.Addition ||
+            row.type === Changes.ChangesView.RowType.Equal) {
+          state.syntaxStyle = innerMode.token(
+              stream, row.type === Changes.ChangesView.RowType.Deletion ? state.baselineState : state.currentState);
+          state.syntaxPos = stream.pos;
+        } else {
+          state.syntaxStyle = '';
+          state.syntaxPos = state.diffPos;
+        }
+      }
+
+      stream.pos = Math.min(state.syntaxPos, state.diffPos);
+      classes += ' ' + state.syntaxStyle;
+      classes += ' ' + state.diffStyle;
+
+      if (stream.eol()) {
         state.lineNumber++;
-        state.index = 0;
+        if (row.type === Changes.ChangesView.RowType.Deletion)
+          state.baselineLineNumber++;
+        else
+          state.currentLineNumber++;
+        state.diffPos = 0;
+        state.syntaxPos = 0;
+        state.diffTokenIndex = 0;
       }
       return classes;
     },
@@ -53,15 +131,39 @@ Changes.ChangesHighlighter = function(config, parserConfig) {
     blankLine: function(state) {
       var row = rows[state.lineNumber];
       state.lineNumber++;
-      state.index = 0;
+      state.syntaxPos = 0;
+      state.diffPos = 0;
+      state.diffTokenIndex = 0;
       if (!row)
         return '';
-      return 'line-background-' + row.type + ' line-' + row.type;
+      if (row.type === Changes.ChangesView.RowType.Deletion)
+        state.baselineLineNumber++;
+      else if (row.type === Changes.ChangesView.RowType.Equal || row.type === Changes.ChangesView.RowType.Addition)
+        state.currentLineNumber++;
+      var style = '';
+      if (innerMode.blankLine) {
+        style = innerMode.blankLine(
+            row.type === Changes.ChangesView.RowType.Deletion ? state.baselineState : state.currentState);
+      }
+      return style + ' line-background-' + row.type + ' line-' + row.type;
+    },
+
+    /**
+     * @param {!Changes.ChangesHighlighter.DiffState} state
+     * @return {!Changes.ChangesHighlighter.DiffState}
+     */
+    copyState: function(state) {
+      var newState = /** @type {!Changes.ChangesHighlighter.DiffState} */ ({});
+      for (var i in state)
+        newState[i] = state[i];
+      newState.currentState = CodeMirror.copyState(innerMode, state.currentState);
+      newState.baselineState = CodeMirror.copyState(innerMode, state.baselineState);
+      return newState;
     }
   };
 };
 
-/** @typedef {!{lineNumber: number, index: number}} */
+/** @typedef {!{lineNumber: number, diffTokenIndex: number}} */

[einbinder, 2017/03/30 19:36:13]

Update with new properties

 Changes.ChangesHighlighter.DiffState;
 
 CodeMirror.defineMode('devtools-diff', Changes.ChangesHighlighter);