DevTools: [CodeMirror] roll CodeMirror to version @e20d175

Source/devtools/front_end/script_formatter_worker/ScriptFormatterWorker.js

 /*
  * Copyright (C) 2011 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 261 matching lines @@
                     name: tokenValue,
                     value: "",
                 };
                 state = FormatterWorker.CSSParserStates.PropertyName;
             } else if (tokenValue === "}" && tokenType === UndefTokenType) {
                 rules.push(rule);
                 state = FormatterWorker.CSSParserStates.Initial;
             }
             break;
         case FormatterWorker.CSSParserStates.PropertyName:
-            if (tokenValue === ":" && tokenType["operator"]) {
+            if (tokenValue === ":" && tokenType === UndefTokenType) {
                 property.name = property.name.trim();
                 state = FormatterWorker.CSSParserStates.PropertyValue;
             } else if (tokenType["property"]) {
                 property.name += tokenValue;
             }
             break;
         case FormatterWorker.CSSParserStates.PropertyValue:
             if (tokenValue === ";" && tokenType === UndefTokenType) {
                 property.value = property.value.trim();
                 rule.properties.push(property);
@@ skipping 89 matching lines @@
     {
         this.line = content;
         this._content = content;
         this._formattedContent = "";
         this._mapping = { original: [0], formatted: [0] };
         this._position = 0;
 
         var scriptOpened = false;
         var styleOpened = false;
         var tokenizer = FormatterWorker.createTokenizer("text/html");
+        var accumulatedTokenValue = "";
+        var accumulatedTokenStart = 0;
 
         /**
          * @this {FormatterWorker.HTMLFormatter}
          */
         function processToken(tokenValue, tokenType, tokenStart, tokenEnd) {
-            if (tokenType !== "tag")
+            if (!tokenType)
                 return;
-            if (tokenValue.toLowerCase() === "<script") {
+            var oldType = tokenType;
+            tokenType = tokenType.split(" ").keySet();
+            if (!tokenType["tag"])
+                return;
+            if (tokenType["bracket"] && (tokenValue === "<" || tokenValue === "</")) {
+                accumulatedTokenValue = tokenValue;
+                accumulatedTokenStart = tokenStart;
+                return;
+            }
+            accumulatedTokenValue = accumulatedTokenValue + tokenValue.toLowerCase();
+            if (accumulatedTokenValue === "<script") {
                 scriptOpened = true;
             } else if (scriptOpened && tokenValue === ">") {
                 scriptOpened = false;
                 this._scriptStarted(tokenEnd);
-            } else if (tokenValue.toLowerCase() === "</script") {
-                this._scriptEnded(tokenStart);
-            } else if (tokenValue.toLowerCase() === "<style") {
+            } else if (accumulatedTokenValue === "</script") {
+                this._scriptEnded(accumulatedTokenStart);
+            } else if (accumulatedTokenValue === "<style") {
                 styleOpened = true;
             } else if (styleOpened && tokenValue === ">") {
                 styleOpened = false;
                 this._styleStarted(tokenEnd);
-            } else if (tokenValue.toLowerCase() === "</style") {
-                this._styleEnded(tokenStart);
+            } else if (accumulatedTokenValue === "</style") {
+                this._styleEnded(accumulatedTokenStart);
             }
+            accumulatedTokenValue = "";
         }
         tokenizer(content, processToken.bind(this));
 
         this._formattedContent += this._content.substring(this._position);
         return { content: this._formattedContent, mapping: this._mapping };
     },
 
     /**
      * @param {number} cursor
      */
@@ skipping 65 matching lines @@
 
 /**
  * @type {!{tokenizer}}
  */
 var exports = { tokenizer: null };
 importScripts("../UglifyJS/parse-js.js");
 var parse = exports;
 
 importScripts("JavaScriptFormatter.js");
 importScripts("CSSFormatter.js");