Changeset 176718 in webkit

Timestamp:

Dec 3, 2014 5:32:01 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

check-webkit-style is confused by ternary expression inside first member initializer
​https://bugs.webkit.org/show_bug.cgi?id=136442

Patch by Renato Nagy <​rnagy@inf.u-szeged.hu> on 2014-12-03
Reviewed by Csaba Osztrogonác.

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

(check_member_initialization_list):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2014-12-03  Renato Nagy  <rnagy@inf.u-szeged.hu>
+
+        check-webkit-style is confused by ternary expression inside first member initializer
+        https://bugs.webkit.org/show_bug.cgi?id=136442
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_member_initialization_list):
+
 2014-12-03  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

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

@@ -2044 +2044 @@
             error(line_number, 'whitespace/init', 4,
                 'Missing spaces around :')
-        if search(r'[^\s]\(.*\)\s?\:.*[^;]*$', line):
+        if (not line.lstrip().startswith(':')) and search(r'[^\s]\(.*\)\s?\:.*[^;]*$', line):
             error(line_number, 'whitespace/indent', 4,
                 'Should be indented on a separate line, with the colon or comma first on that line.')

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

@@ -5088 +5088 @@
         'Should be indented on a separate line, with the colon or comma first on that line.'
         '  [whitespace/indent] [4]')
+        self.assert_multi_line_lint((
+            'MyClass::MyClass(Document* doc)\n'
+            '    : m_myMember(b ? bar() : baz())\n'
+            '    , MySuperClass()\n'
+            '    , m_doc(0)\n'
+            '{ }'), '')
         self.assert_multi_line_lint('''\
         MyClass::MyClass(Document* doc) : MySuperClass()