Changeset 199958 in webkit

Timestamp:

Apr 23, 2016 7:25:46 PM (8 years ago)

Author:

aestes@apple.com

Message:

check-webkit-style: fix false-positive warnings about @synchronized
​https://bugs.webkit.org/show_bug.cgi?id=156957

Reviewed by Dan Bernstein.

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

(check_spacing_for_function_call): Ignore @synchronized lines.
(check_braces): Ditto.

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

(CppStyleTest.test_brace_at_begin_of_line): Added a test case.

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 @@
+2016-04-23  Andy Estes  <aestes@apple.com>
+
+        check-webkit-style: fix false-positive warnings about @synchronized
+        https://bugs.webkit.org/show_bug.cgi?id=156957
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_spacing_for_function_call): Ignore @synchronized lines.
+        (check_braces): Ditto.
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (CppStyleTest.test_brace_at_begin_of_line): Added a test case.
+
 2016-04-22  Srinivasan Vijayaraghavan  <svijayaraghavan@apple.com>
 

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

@@ -1477 +1477 @@
                   'Extra space after (')
         if (search(r'\w\s+\(', function_call)
-            and not match(r'\s*((#|typedef|@property|@interface|@implementation)|} @catch\b)', function_call)):
+            and not match(r'\s*((#|typedef|@property|@interface|@implementation|@synchronized)|} @catch\b)', function_call)):
             error(line_number, 'whitespace/parens', 4,
                   'Extra space before ( in function call')
@@ -2427 +2427 @@
     elif (search(r'\)\s*(((const|override)\s*)*\s*)?{\s*$', line)
           and line.count('(') == line.count(')')
-          and not search(r'(\b(if|for|while|switch|NS_ENUM)|} @catch)\b', line)
+          and not search(r'(\s*(if|for|while|switch|NS_ENUM|@synchronized)|} @catch)\b', line)
           and not match(r'\s+[A-Z_][A-Z_0-9]+\b', line)):
         error(line_number, 'whitespace/braces', 4,

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

@@ -1788 +1788 @@
             '    @try {\n'
             '    } @catch (NSException *exception) {\n'
+            '    }\n',
+            '')
+        self.assert_multi_line_lint(
+            '    @synchronized (self) {\n'
             '    }\n',
             '')