DevTools: Use CodeMirror modes instead of highlight tokenizers

Source/devtools/front_end/CodeMirrorTextEditor.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 importScript("cm/markselection.js");
 importScript("cm/comment.js");
 importScript("cm/overlay.js");
 
 importScript("cm/htmlembedded.js");
 importScript("cm/clike.js");
 importScript("cm/coffeescript.js");
 importScript("cm/php.js");
 importScript("cm/python.js");
 importScript("cm/shell.js");
+importScript("CodeMirrorUtils.js");
 
 /**
  * @constructor
  * @extends {WebInspector.View}
  * @implements {WebInspector.TextEditor}
  * @param {?string} url
  * @param {WebInspector.TextEditorDelegate} delegate
  */
 WebInspector.CodeMirrorTextEditor = function(url, delegate)
 {
@@ skipping 97 matching lines @@
     this.element.style.overflow = "hidden";
     this.element.firstChild.addStyleClass("source-code");
     this.element.firstChild.addStyleClass("fill");
     this._elementToWidget = new Map();
     this._nestedUpdatesCounter = 0;
 
     this.element.addEventListener("focus", this._handleElementFocus.bind(this), false);
     this.element.addEventListener("keydown", this._handleKeyDown.bind(this), true);
     this.element.tabIndex = 0;
 
-    this._overrideModeWithPrefixedTokens("css-base", "css-");
-    this._overrideModeWithPrefixedTokens("javascript", "js-");
-    this._overrideModeWithPrefixedTokens("xml", "xml-");
-
     this._setupSelectionColor();
     this._setupWhitespaceHighlight();
 }
 
 WebInspector.CodeMirrorTextEditor.autocompleteCommand = function(codeMirror)
 {
     codeMirror._codeMirrorTextEditor._autocompleteController.autocomplete();
 }
 CodeMirror.commands.autocomplete = WebInspector.CodeMirrorTextEditor.autocompleteCommand;
 
@@ skipping 266 matching lines @@
         if (!element || !element.isSelfOrDescendant(this._codeMirror.getWrapperElement()))
             return null;
         var gutterBox = this._codeMirror.getGutterElement().boxInWindow();
         if (x >= gutterBox.x && x <= gutterBox.x + gutterBox.width &&
             y >= gutterBox.y && y <= gutterBox.y + gutterBox.height)
             return null;
         var coords = this._codeMirror.coordsChar({left: x, top: y});
         return this._toRange(coords, coords);
     },
 
-    _convertTokenType: function(tokenType)
-    {
-        if (tokenType.startsWith("js-variable") || tokenType.startsWith("js-property") || tokenType === "js-def")
-            return "javascript-ident";
-        if (tokenType === "js-string-2")
-            return "javascript-regexp";
-        if (tokenType === "js-number" || tokenType === "js-comment" || tokenType === "js-string" || tokenType === "js-keyword")
-            return "javascript-" + tokenType.substring("js-".length);
-        return null;
-    },
-
     /**
      * @param {number} lineNumber
      * @param {number} column
      * @return {?{startColumn: number, endColumn: number, type: string}}
      */
     tokenAtTextPosition: function(lineNumber, column)
     {
         if (lineNumber < 0 || lineNumber >= this._codeMirror.lineCount())
             return null;
         var token = this._codeMirror.getTokenAt(new CodeMirror.Pos(lineNumber, (column || 0) + 1));
         if (!token || !token.type)
             return null;
-        var convertedType = this._convertTokenType(token.type);
+        var convertedType = WebInspector.CodeMirrorUtils.convertTokenType(token.type);
         if (!convertedType)
             return null;
         return {
             startColumn: token.start,
             endColumn: token.end - 1,
             type: convertedType
         };
     },
 
     /**
@@ skipping 60 matching lines @@
             }
             var whitespaceMode = {
                 token: nextToken
             };
             return CodeMirror.overlayMode(CodeMirror.getMode(config, mimeType), whitespaceMode, false);
         }
         CodeMirror.defineMode(modeName, modeConstructor);
         return modeName;
     },
 
-    /**
-     * @param {string} modeName
-     * @param {string} tokenPrefix
-     */
-    _overrideModeWithPrefixedTokens: function(modeName, tokenPrefix)
-    {
-        var oldModeName = modeName + "-old";
-        if (CodeMirror.modes[oldModeName])
-            return;
-
-        CodeMirror.defineMode(oldModeName, CodeMirror.modes[modeName]);
-        CodeMirror.defineMode(modeName, modeConstructor);
-
-        function modeConstructor(config, parserConfig)
-        {
-            var innerConfig = {};
-            for (var i in parserConfig)
-                innerConfig[i] = parserConfig[i];
-            innerConfig.name = oldModeName;
-            var codeMirrorMode = CodeMirror.getMode(config, innerConfig);
-            codeMirrorMode.name = modeName;
-            codeMirrorMode.token = tokenOverride.bind(this, codeMirrorMode.token);
-            return codeMirrorMode;
-        }
-
-        function tokenOverride(superToken, stream, state)
-        {
-            var token = superToken(stream, state);
-            return token ? tokenPrefix + token : token;
-        }
-    },
-
     _enableLongLinesMode: function()
     {
         this._codeMirror.setOption("styleSelectedText", false);
         this._longLinesMode = true;
     },
 
     _disableLongLinesMode: function()
     {
         this._codeMirror.setOption("styleSelectedText", true);
         this._longLinesMode = false;
@@ skipping 959 matching lines @@
      * @param {number} line
      * @param {number} column
      * @return {AnchorBox}
      */
     _anchorBoxForPosition: function(line, column)
     {
         var metrics = this._textEditor.cursorPositionToCoordinates(line, column);
         return metrics ? new AnchorBox(metrics.x, metrics.y, 0, metrics.height) : null;
     },
 }