Changeset 222937 in webkit

Timestamp:

Oct 5, 2017, 3:41:15 PM (8 years ago)

Author:

Megan Gardner

Message:

check-webkit-style erroneously requires a space between the carrot and brace in obj-c blocks.
​https://bugs.webkit.org/show_bug.cgi?id=177897

Reviewed by Dan Bernstein and Jonathan Bedard.

Remove the check for a space between ^{and {,
as this is valid and expected Obj-C. Now check to make sure there is
no space at all between} and {, and also that there is a space between
the end of an argument list and the {.

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

(regex_for_lambdas_and_blocks):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2017-10-04  Megan Gardner  <megan_gardner@apple.com>
+
+        check-webkit-style erroneously requires a space between the carrot and brace in obj-c blocks.
+        https://bugs.webkit.org/show_bug.cgi?id=177897
+
+        Reviewed by Dan Bernstein and Jonathan Bedard.
+
+        Remove the check for a space between ^ and {, 
+        as this is valid and expected Obj-C. Now check to make sure there is
+        no space at all between ^ and {, and also that there is a space between
+        the end of an argument list and the {.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (regex_for_lambdas_and_blocks):
+
 2017-10-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -1242 +1242 @@
 def regex_for_lambdas_and_blocks(line, line_number, file_state, error):
     cpp_result = search(r'\s\[.*?\]\s', line)
-    objc_result = search(r'(\s\^\s?\(.*?\)\s|\^\s?\{|:\^\s?\(.*?\)\s\{)', line)
+    objc_result = search(r'(\s\^\s?\(.*?\)\s?|\^\s*\{|:\^\s?\(.*?\)\s\{)', line)
     if cpp_result:
         group = cpp_result.group()
@@ -1249 +1249 @@
         if search(r'(\[\s|\s\]|\s,)', group):
             targ_error = [line_number, 'whitespace/brackets', 4,
-              'Extra space in capture list.']
+              'Extra space in capture list.',line]
 
         if targ_error and regex_for_lambdas_and_blocks.__last_error != targ_error:
@@ -1262 +1262 @@
         if search(r'(\(\s|\s\)|\s,)', group):
             targ_error = [line_number, 'whitespace/brackets', 4,
-              'Extra space in block arguments.']
-        if search(r'\^\{', group):
+              'Extra space in block arguments.',line]
+        if search(r'\^\s+\{', group):
             targ_error = [line_number, 'whitespace/brackets', 4,
-              'No space between ^ and block definition.']
+              'Extra space between ^ and block definition.',line]
         if search(r'\^\s\(', group):
             targ_error = [line_number, 'whitespace/brackets', 4,
-              'Extra space between ^ and block arguments.']
+              'Extra space between ^ and block arguments.',line]
 
         if targ_error and regex_for_lambdas_and_blocks.__last_error != targ_error:

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

@@ -1943 +1943 @@
         self.assert_lint('        ^(var,var_ref) {', 'Missing space after ,  [whitespace/comma] [3]', 'foo.m')
         self.assert_lint('        ^(var, var_ref) {', 'Place brace on its own line for function definitions.  [whitespace/braces] [4]', 'foo.cpp')
-        self.assert_lint('        ^ {', '', 'foo.m')
-        self.assert_lint('        ^{', 'No space between ^ and block definition.  [whitespace/brackets] [4]', 'foo.m')
+        self.assert_lint('        ^{', '', 'foo.m')
+        self.assert_lint('        ^ {', 'Extra space between ^ and block definition.  [whitespace/brackets] [4]', 'foo.m')
+        self.assert_lint('        ^   {', 'Extra space between ^ and block definition.  [whitespace/brackets] [4]', 'foo.m')
         self.assert_lint('        ^ (arg1, arg2) {', 'Extra space between ^ and block arguments.  [whitespace/brackets] [4]', 'foo.m')
+        self.assert_lint('        ^(arg1, arg2){', 'Missing space before {  [whitespace/braces] [5]', 'foo.m')
 
     def test_objective_c_block_as_argument(self):
         self.assert_lint('        withLambda:^(var, var_ref) {', '', 'foo.mm')
-        self.assert_lint('        withLambda:^ {', '', 'foo.m')
-        self.assert_lint('        withLambda:^{', 'No space between ^ and block definition.  [whitespace/brackets] [4]', 'foo.m')
+        self.assert_lint('        withLambda:^{', '', 'foo.m')
+        self.assert_lint('        withLambda:^ {', 'Extra space between ^ and block definition.  [whitespace/brackets] [4]', 'foo.m')
 
     def test_spacing_around_else(self):