Changeset 274481 in webkit

Timestamp:

Mar 16, 2021, 9:05:55 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[prepare-ChangeLog] Assigning a multiline comment to a variable breaks change detection
​https://bugs.webkit.org/show_bug.cgi?id=223225

Patch by Dean Johnson <​dean_johnson@apple.com> on 2021-03-16
Reviewed by Jonathan Bedard.

• Scripts/prepare-ChangeLog:

(get_function_line_ranges_for_python): Remove '^{' prefix from regex so we match multiline
strings assigned to variables.}

• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/python_unittests-expected.txt:
• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/python_unittests.py: Add multiline string

variable definition, which previously would cause prepare-ChangeLog to parse the remainder of the file
as a multiline comment. Also add a new test to ensure it's not skipped by multiline logic.
(Class8.init):
(Class9):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (1 diff)
• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/python_unittests-expected.txt (modified) (1 diff)
• Scripts/webkitperl/prepare-ChangeLog_unittest/resources/python_unittests.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-03-16  Dean Johnson  <dean_johnson@apple.com>
+
+        [prepare-ChangeLog] Assigning a multiline comment to a variable breaks change detection
+        https://bugs.webkit.org/show_bug.cgi?id=223225
+
+        Reviewed by Jonathan Bedard.
+
+        * Scripts/prepare-ChangeLog:
+        (get_function_line_ranges_for_python): Remove '^' prefix from regex so we match multiline
+        strings assigned to variables.
+        * Scripts/webkitperl/prepare-ChangeLog_unittest/resources/python_unittests-expected.txt:
+        * Scripts/webkitperl/prepare-ChangeLog_unittest/resources/python_unittests.py: Add multiline string
+        variable definition, which previously would cause prepare-ChangeLog to parse the remainder of the file
+        as a multiline comment. Also add a new test to ensure it's not skipped by multiline logic.
+        (Class8.__init__):
+        (Class9):
+
 2021-03-16  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Tools/Scripts/prepare-ChangeLog

@@ -1799 +1799 @@
 
     my $multilineStringLiteralSentinelRegEx = qr#(?:"""|''')#;
-    my $multilineStringLiteralStartRegEx = qr#^\s*$multilineStringLiteralSentinelRegEx#;
+    my $multilineStringLiteralStartRegEx = qr#\s*$multilineStringLiteralSentinelRegEx#;
     my $multilineStringLiteralEndRegEx = qr#$multilineStringLiteralSentinelRegEx\s*$#;
 

trunk/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/python_unittests-expected.txt

@@ -170 +170 @@
     [
       '142',
-      '143',
+      '145',
       'Class8.__init__'
+    ],
+    [
+      '151',
+      '152',
+      'Class9'
     ],
   ]

trunk/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/python_unittests.py

@@ -142 +142 @@
     def __init__(self):
         pass
+
+
+MULTILINE_STRING_VARIABLE = '''
+some text
+some more text
+'''
+
+class Class9:
+    pass