Changeset 252433 in webkit

Timestamp:

Nov 13, 2019, 2:56:54 PM (7 years ago)

Author:

Megan Gardner

Message:

check-webkit-style: fix false errors for obj-c method calls in range-based for statements using colon syntax
​https://bugs.webkit.org/show_bug.cgi?id=204142

Reviewed by Jonathan Bedard.

Allow for the existance of an obj-c method call in a range-based for statement that also uses colons.
Do not allow colons between square brackets to trigger the error.
Also add a test for this specific case.

• Scripts/webkitpy/style/checkers/cpp.py:

(check_spacing):

• Scripts/webkitpy/style/checkers/cpp_unittest.py:

(WebKitStyleTest.test_spacing):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp.py (modified) (2 diffs)
• Scripts/webkitpy/style/checkers/cpp_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-11-13  Megan Gardner  <megan_gardner@apple.com>
+
+        check-webkit-style: fix false errors for obj-c method calls in range-based for statements using colon syntax
+        https://bugs.webkit.org/show_bug.cgi?id=204142
+
+        Reviewed by Jonathan Bedard.
+
+        Allow for the existance of an obj-c method call in a range-based for statement that also uses colons.
+        Do not allow colons between square brackets to trigger the error.
+        Also add a test for this specific case.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_spacing):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_spacing):
+
 2019-11-13  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

@@ -1979 +1979 @@
     # We don't want: "if ( foo)" or "if ( foo   )".
     # Exception: "for ( ; foo; bar)" and "for (foo; bar; )" are allowed.
+    # Exception: "for (foo n in [foo bar:baz])" is allowed because of obj-c method calls
     matched = search(r'\b(?P<statement>if|for|while|switch)\s*\((?P<remainder>.*)$', line)
     if matched:
@@ -1984 +1985 @@
         condition, rest = up_to_unmatched_closing_paren(matched.group('remainder'))
         if condition is not None:
-            if statement == 'for' and search(r'(?:[^ :]:[^:]|[^:]:[^ :])', condition):
-                error(line_number, 'whitespace/colon', 4, 'Missing space around : in range-based for statement')
+            if statement == 'for' and search(r'(?:[^ :]:[^:]|[^:]:[^ :])', condition) and not search(r'\[[^\]]+:[^\]]*\]', condition):
+                    error(line_number, 'whitespace/colon', 4, 'Missing space around : in range-based for statement')
             condition_match = search(r'(?P<leading>[ ]*)(?P<separator>.).*[^ ]+(?P<trailing>[ ]*)', condition)
             if condition_match:

trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

@@ -4361 +4361 @@
 
         self.assert_multi_line_lint(
+            '    for (foo *bar in [foo bar:baz])\n'
+            '        process(bar);\n',
+            '',
+            'foo.mm')
+
+        self.assert_multi_line_lint(
             '    for (const Vector& vector: vectors)\n'
             '        process(vector);\n',