Changeset 219577 in webkit

Timestamp:

Jul 17, 2017 3:40:18 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Update style checker to deal with "final"
​https://bugs.webkit.org/show_bug.cgi?id=174528

Patch by Yoshiaki Jitsukawa <​Yoshiaki.Jitsukawa@sony.com> on 2017-07-17
Reviewed by Alex Christensen.

check-webkit-style shouldn't complain about an open brace to start a
line after a function definition with "final" or "const final".

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

(check_braces):

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

(CppStyleTest.test_brace_at_begin_of_line):

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) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-07-17  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        Update style checker to deal with "final"
+        https://bugs.webkit.org/show_bug.cgi?id=174528
+
+        Reviewed by Alex Christensen.
+        
+        check-webkit-style shouldn't complain about an open brace to start a
+        line after a function definition with "final" or "const final".
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_braces):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (CppStyleTest.test_brace_at_begin_of_line):
+
 2017-07-17  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -2431 +2431 @@
         # and '- (' and '+ (' for Objective-C methods.
         previous_line = get_previous_non_blank_line(clean_lines, line_number)[0]
-        if ((not search(r'[;:}{)=]\s*$|\)\s*((const|override|const override)\s*)?(->\s*\S+)?\s*$', previous_line)
+        if ((not search(r'[;:}{)=]\s*$|\)\s*((const|override|const override|final|const final)\s*)?(->\s*\S+)?\s*$', previous_line)
              or search(r'\b(if|for|while|switch|else|NS_ENUM)\b', previous_line)
              or regex_for_lambdas_and_blocks(previous_line, line_number, file_state, error))
@@ -2439 +2439 @@
             error(line_number, 'whitespace/braces', 4,
                   'This { should be at the end of the previous line')
-    elif (search(r'\)\s*(((const|override)\s*)*\s*)?{\s*$', line)
+    elif (search(r'\)\s*(((const|override|final)\s*)*\s*)?{\s*$', line)
           and line.count('(') == line.count(')')
           and not search(r'(\s*(if|for|while|switch|NS_ENUM|@synchronized)|} @catch)\b', line)

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

@@ -1793 +1793 @@
             'Place brace on its own line for function definitions.  [whitespace/braces] [4]')
         self.assert_multi_line_lint(
+            'int foo() const final {',
+            'Place brace on its own line for function definitions.  [whitespace/braces] [4]')
+        self.assert_multi_line_lint(
+            'int foo() final {',
+            'Place brace on its own line for function definitions.  [whitespace/braces] [4]')
+        self.assert_multi_line_lint(
             'int foo() const\n'
             '{\n'
@@ -1799 +1805 @@
         self.assert_multi_line_lint(
             'int foo() override\n'
+            '{\n'
+            '}\n',
+            '')
+        self.assert_multi_line_lint(
+            'int foo() final\n'
             '{\n'
             '}\n',
@@ -1819 +1830 @@
         self.assert_multi_line_lint(
             'int foo() const override\n'
+            '{\n'
+            '}\n',
+            '')
+        self.assert_multi_line_lint(
+            'int foo() const final\n'
             '{\n'
             '}\n',