[Tools] correctly check for braces in multiline branches in macro definition

https://bugs.webkit.org/show_bug.cgi?id=156441

Patch by Caitlin Potter <[email protected]> on 2016-04-10
Reviewed by Darin Adler.

Prevents emitting whitespace/braces warning for code like the
following:

```
#define MACRO(x) \
    if (x) { \
        doTheThing(); \
        continue; \
    }
```

* Scripts/webkitpy/style/checkers/cpp.py:
(check_braces):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(WebKitStyleTest.test_line_breaking):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@199288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Tools/ChangeLog

@@ -1,3 +1,26 @@
+2016-04-10  Caitlin Potter  <[email protected]>
+
+        [Tools] correctly check for braces in multiline branches in macro definition
+        https://bugs.webkit.org/show_bug.cgi?id=156441
+
+        Reviewed by Darin Adler.
+
+        Prevents emitting whitespace/braces warning for code like the
+        following:
+
+        ```
+        #define MACRO(x) \
+            if (x) { \
+                doTheThing(); \
+                continue; \
+            }
+        ```
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_braces):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_line_breaking):
+
 2016-04-08  Youenn Fablet  <[email protected]>
 
         Testharness-based tests that time out should be able to produce a detailed output

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

@@ -2471,8 +2471,9 @@ def check_braces(clean_lines, line_number, error):
             or search(r'^#\S*', clean_lines.elided[begin_line_number + 1])):
             begin_line_number = begin_line_number + 1
             begin_line = clean_lines.elided[begin_line_number]
-            if search(r'.*{$', begin_line):
-                has_braces = True
+
+        if search(r'.*{(.*?\\)?$', begin_line):
+            has_braces = True
 
         next_line = clean_lines.elided[begin_line_number + 1]
         after_next_line = clean_lines.elided[begin_line_number + 2]

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

@@ -4243,6 +4243,19 @@ def test_line_breaking(self):
         self.assert_multi_line_lint(
             'WTF_MAKE_NONCOPYABLE(ClassName); WTF_MAKE_FAST_ALLOCATED;\n',
             '')
+        self.assert_multi_line_lint(
+            '#define MyMacro(name, status) \\\n'
+            '    if (strstr(arg, #name) { \\\n'
+            '        name##_ = !status; \\\n'
+            '        continue; \\\n'
+            '    }\n',
+            '')
+        self.assert_multi_line_lint(
+            '#define MyMacro(name, status) \\\n'
+            '    if (strstr(arg, #name) \\\n'
+            '        name##_ = !status; \\\n'
+            '        continue;\n',
+            'Multi line control clauses should use braces.  [whitespace/braces] [4]')
         self.assert_multi_line_lint(
             'if (condition) {\n'
             '    doSomething();\n'