Web Inspector: PrettyPrinting regression on "var a=1"

[WebKit-https.git] / Source / WebInspectorUI / Tools / PrettyPrinting / CodeMirrorFormatters.js

diff --git a/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js b/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js
index 296d0e7e54906265631331deabf0fad92ed4a7b9..a4075d40adfdd8edf0a7f1db5b76b4d16bc19002 100644 (file)
--- a/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js
+++ b/Source/WebInspectorUI/Tools/PrettyPrinting/CodeMirrorFormatters.js
@@ -35,14 +35,18 @@ CodeMirror.extendMode("javascript", {
                 return lastToken && /\bkeyword\b/.test(lastToken) && (lastContent !== "function" && lastContent !== "typeof" && lastContent !== "instanceof");
             if (content === ":") // Ternary.
                 return (state.lexical.type === "stat" || state.lexical.type === ")");
-            if (content === "!") // Unary ! should not be confused with "!=".
-                return false;
-            return "+-/*&&||!===+=-=>=<=?".indexOf(content) >= 0; // Operators.
+            return false;
         }
 
         if (isComment)
             return true;
 
+        if (/\boperator\b/.test(token)) {
+            if (content === "!") // Unary ! should not be confused with "!=".
+                return false;
+            return "+-/*&&||!===+=-=>=<=?".indexOf(content) >= 0; // Operators.
+        }
+
         if (/\bkeyword\b/.test(token)) { // Most keywords require spaces before them, unless a '}' can come before it.
             if (content === "else" || content === "catch" || content === "finally")
                 return lastContent === "}";