Changeset 245741 in webkit

Timestamp:

May 23, 2019 8:19:52 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: prevent stripping console.assert if it's used inside a string
​https://bugs.webkit.org/show_bug.cgi?id=198207

Reviewed by Joseph Pecoraro.

• Scripts/remove-console-asserts.pl:

(removeConsoleAssertsInFile):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Scripts/remove-console-asserts.pl (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-05-23  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: prevent stripping `console.assert` if it's used inside a string
+        https://bugs.webkit.org/show_bug.cgi?id=198207
+
+        Reviewed by Joseph Pecoraro.
+
+        * Scripts/remove-console-asserts.pl:
+        (removeConsoleAssertsInFile):
+
 2019-05-23  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/Scripts/remove-console-asserts.pl

@@ -50 +50 @@
         }
 
-        s/\s*console\.assert\(.*\);\s*//g;
+        s/^\s*console\.assert\(.*\);\s*//g;
         print $out $_;
         $previousLine = $_ if $_ !~ /^\s*$/;
@@ -56 +56 @@
         # If console.assert is still on the line, either we missed a semicolon or it is multi-line. These did not get stripped.
         if ($_ =~ /\s*console\.assert\(/) {
+            # Allow "console.assert()" to be used as part of a string.
+            next if /^.*?["'`].*?console\.assert/;
+
+            # Allow "console.assert()" to be used as part of a comment.
+            next if /^.*?(\/\/|\/\*).*?console\.assert/;
+
             if ($_ =~ /\)\s*$/) {
                 print "WARNING: console.assert missing trailing semicolon on line $.: $_" ;