Changeset 194013 in webkit

Timestamp:

Dec 12, 2015 9:09:44 PM (8 years ago)

Author:

Matt Baker

Message:

Web Inspector: CodeMirrorTokenTrackingController handles symbols in class definitions incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=152218

Reviewed by Timothy Hatcher.

• UserInterface/Controllers/CodeMirrorTokenTrackingController.js:

(WebInspector.CodeMirrorTokenTrackingController.prototype._processJavaScriptExpression):
Stop checking for object literal shorthand property if an open parenthesis is found.
This check became necessary with the introduction of ES6 class syntax.

• UserInterface/Views/CodeMirrorAdditions.js:

Use localState when available, to prevent passing a state that doesn't define a tokenize property.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/CodeMirrorTokenTrackingController.js (modified) (1 diff)
• UserInterface/Views/CodeMirrorAdditions.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-12-12  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: CodeMirrorTokenTrackingController handles symbols in class definitions incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=152218
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Controllers/CodeMirrorTokenTrackingController.js:
+        (WebInspector.CodeMirrorTokenTrackingController.prototype._processJavaScriptExpression):
+        Stop checking for object literal shorthand property if an open parenthesis is found.
+        This check became necessary with the introduction of ES6 class syntax.
+
+        * UserInterface/Views/CodeMirrorAdditions.js:
+        Use localState when available, to prevent passing a state that doesn't define a tokenize property.
+
 2015-12-12  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js

@@ -514 +514 @@
                 if (tokenType)
                     return false;
+                if (string === "(")
+                    return false;
                 if (string === "," || string === "}") {
                     shorthand = true;

trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js

@@ -628 +628 @@
 {
     let state = CodeMirror.copyState(mode, cm.getTokenAt(initialPosition).state);
+    if (state.localState)
+        state = state.localState;
+
     let lineCount = cm.lineCount();
-
     let abort = false;
     for (lineNumber = initialPosition.line; !abort && lineNumber < lineCount; ++lineNumber) {