Changeset 235452 in webkit

Timestamp:

Aug 28, 2018 6:36:36 PM (6 years ago)

Author:

Devin Rousso

Message:

console.log() shows (anonymous function) instead of the passed string when a certain format is used
​https://bugs.webkit.org/show_bug.cgi?id=188946
<rdar://problem/43756428>

Reviewed by Brian Burg.

Source/WebInspectorUI:

Stack trace URLs are much more likely to follow the following format:

<protocol>:<path>:<line>:<column>

Modify the test regexp to always require that a protocol exists and to check that there are
no ":" inside the protocol or path. Additionally, stack traces usually have more than one
frame, so return false if there isn't more than one line.

• UserInterface/Models/StackTrace.js:

(WI.StackTrace.isLikelyStackTrace):

LayoutTests:

• inspector/console/js-isLikelyStackTrace-expected.txt:
• inspector/console/js-isLikelyStackTrace.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/console/js-isLikelyStackTrace-expected.txt (modified) (1 diff)
• LayoutTests/inspector/console/js-isLikelyStackTrace.html (modified) (1 diff)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Models/StackTrace.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-08-28  Devin Rousso  <drousso@apple.com>
+
+        console.log() shows (anonymous function) instead of the passed string when a certain format is used
+        https://bugs.webkit.org/show_bug.cgi?id=188946
+        <rdar://problem/43756428>
+
+        Reviewed by Brian Burg.
+
+        * inspector/console/js-isLikelyStackTrace-expected.txt:
+        * inspector/console/js-isLikelyStackTrace.html:
+
 2018-08-28  Truitt Savell  <tsavell@apple.com>
 

trunk/LayoutTests/inspector/console/js-isLikelyStackTrace-expected.txt

@@ -19 +19 @@
     Actual: false
 
+-- Running test case: testFormattedStrings
+PASS: "video:1:2" should not be a stacktrace.
+PASS: "video/mp4:1:2" should not be a stacktrace.
+PASS: "video/mp4 : 11:22:33-44:55:66" should not be a stacktrace.
+PASS: "http://video:1:2" should not be a stacktrace.
+PASS: "http://video/mp4:1:2" should not be a stacktrace.
+PASS: "http://video/mp4 : 11:22:33-44:55:66" should not be a stacktrace.
+

trunk/LayoutTests/inspector/console/js-isLikelyStackTrace.html

@@ -96 +96 @@
     });
 
+    suite.addTestCase({
+        name: "testFormattedStrings",
+        test(resolve, reject) {
+            const strings = [
+                "video:1:2",
+                "video/mp4:1:2",
+                "video/mp4 : 11:22:33-44:55:66",
+                "http://video:1:2",
+                "http://video/mp4:1:2",
+                "http://video/mp4 : 11:22:33-44:55:66",
+            ];
+            
+            for (let string of strings)
+                InspectorTest.expectThat(!WI.StackTrace.isLikelyStackTrace(string), `"${string}" should not be a stacktrace.`);
+
+            resolve();
+        }
+    });
+
     suite.runTestCasesAndFinish();
 }

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-08-28  Devin Rousso  <drousso@apple.com>
+
+        console.log() shows (anonymous function) instead of the passed string when a certain format is used
+        https://bugs.webkit.org/show_bug.cgi?id=188946
+        <rdar://problem/43756428>
+
+        Reviewed by Brian Burg.
+
+        Stack trace URLs are much more likely to follow the following format:
+
+            <protocol>://<path>:<line>:<column>
+
+        Modify the test regexp to always require that a protocol exists and to check that there are
+        no ":" inside the protocol or path. Additionally, stack traces usually have more than one
+        frame, so return false if there isn't more than one line.
+
+        * UserInterface/Models/StackTrace.js:
+        (WI.StackTrace.isLikelyStackTrace):
+
 2018-08-28  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/StackTrace.js

@@ -81 +81 @@
             return false;
 
+        const reasonablyLongProtocolLength = 10;
         const reasonablyLongLineLength = 500;
         const reasonablyLongNativeMethodLength = 120;
-        const stackTraceLine = `(.{1,${reasonablyLongLineLength}}:\\d+:\\d+|eval code|.{1,${reasonablyLongNativeMethodLength}}@\\[native code\\])`;
-        const stackTrace = new RegExp(`^${stackTraceLine}(\\n${stackTraceLine})*$`, "g");
-
+        const stackTraceLine = `(global code|eval code|module code|\\w+)?([^:]{1,${reasonablyLongProtocolLength}}://[^:]{1,${reasonablyLongLineLength}}:\\d+:\\d+|[^@]{1,${reasonablyLongNativeMethodLength}}@\\[native code\\])`;
+        const stackTrace = new RegExp(`^${stackTraceLine}([\\n\\r]${stackTraceLine})+$`, "g");
         return stackTrace.test(stack);
     }