Attachment 361550 Details for Bug 194459 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

interpolation-1.patch (text/plain), 2.38 KB, created by Joseph Pecoraro on 2019-02-08 15:56:31 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2019-02-08 15:56:31 PST

Size: 2.38 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 339393a0a86..4c9cdff2269 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-02-08  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        Web Inspector: Debugger Popover should work with value in template string `${identifier}`
>+        https://bugs.webkit.org/show_bug.cgi?id=194459
>+        <rdar://problem/47932564>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Controllers/CodeMirrorTokenTrackingController.js:
>+        (WI.CodeMirrorTokenTrackingController.prototype._processJavaScriptExpression):
>+        When walking backwards to get the full expression we were walking outside
>+        of the interpolation group `outside ${inside}`. Stop walking backwards once
>+        we cross the boundary.
>+
> 2019-02-08  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Web Inspector: Import / Export Heap Snapshots
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js b/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js
>index e8596c70886..c3beef0a3fb 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js
>@@ -578,10 +578,16 @@ WI.CodeMirrorTokenTrackingController = class CodeMirrorTokenTrackingController e
>             if (!isDot && !isExpression)
>                 break;
> 
>-            // Disallow operators. We want the hovered expression to be just a single operand.
>-            // Also, some operators can modify values, such as pre-increment and assignment operators.
>-            if (isExpression && token.type.includes("operator"))
>-                break;
>+            if (isExpression) {
>+                // Disallow operators. We want the hovered expression to be just a single operand.
>+                // Also, some operators can modify values, such as pre-increment and assignment operators.
>+                if (token.type.includes("operator"))
>+                    break;
>+
>+                // Don't break out of a template string quasi group.
>+                if (token.type.includes("string-2"))
>+                    break;
>+            }
> 
>             expression = token.string + expression;
>             expressionStartPosition.ch = token.start;

Actions: View | Formatted Diff | Diff

Attachments on bug 194459: 361550