Changeset 240299 in webkit

Timestamp:

Jan 22, 2019 2:51:19 PM (5 years ago)

Author:

ddkilzer@apple.com

Message:

check-webkit-style reports false-positive whitespace/init warning in C++ initialization parameters
<​https://webkit.org/b/193676>

Reviewed by Alexey Proskuryakov.

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

(check_member_initialization_list):

• Don't report missing whitespace around colon if the colon at the start of the line is formatted correctly.
• Scripts/webkitpy/style/checkers/cpp_unittest.py:

(WebKitStyleTest.test_member_initialization_list):

• Add a test for a missing permutation of existing tests.
• Add a test this false-positive.
• Add blank lines between subtests to make them easier to read.

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

trunk/Tools/ChangeLog

@@ +1 @@
+2019-01-22  David Kilzer  <ddkilzer@apple.com>
+
+        check-webkit-style reports false-positive whitespace/init warning in C++ initialization parameters
+        <https://webkit.org/b/193676>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_member_initialization_list):
+        - Don't report missing whitespace around colon if the colon at
+          the start of the line is formatted correctly.
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_member_initialization_list):
+        - Add a test for a missing permutation of existing tests.
+        - Add a test this false-positive.
+        - Add blank lines between subtests to make them easier to read.
+
 2019-01-22  Aakash Jain  <aakash_jain@apple.com>
 

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

@@ -2105 +2105 @@
     # match the start of initialization list
     if search(r'^(?P<indentation>\s*)((explicit\s+)?[^(\s|\?)]+\([^\?]*\)\s?\:|^(\s|\?)*\:)([^\:]|\Z)[^;]*$', line):
-        if search(r'[^:]\:[^\:\s]+', line):
+        if search(r'[^:]\:[^\:\s]+', line) and not search(r'^\s*:\s\S+', line):
             error(line_number, 'whitespace/init', 4,
                 'Missing spaces around :')

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

@@ -5504 +5504 @@
         'Should be indented on a separate line, with the colon or comma first on that line.'
         '  [whitespace/indent] [4]')
+
         self.assert_lint('MyClass::MyClass(Document* doc) : MySuperClass() { }',
         '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'
@@ -5513 +5515 @@
             '    , m_doc(0)\n'
             '{ }'), '')
+
         self.assert_multi_line_lint('''\
         MyClass::MyClass(Document* doc) : MySuperClass()
@@ -5518 +5521 @@
         '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)
@@ -5524 +5528 @@
         'Wrong number of spaces before statement. (expected: 12)'
         '  [whitespace/indent] [4]')
+
         self.assert_multi_line_lint('''\
         MyClass::MyClass(Document* doc) :
@@ -5533 +5538 @@
          'Comma should be at the beginning of the line in a member initialization list.'
          '  [whitespace/init] [4]'])
+
+        self.assert_multi_line_lint('''\
+            MyClass::MyClass(Document* doc): MySuperClass()
+            { }''',
+            '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) :MySuperClass()
@@ -5539 +5551 @@
          '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):MySuperClass()
@@ -5545 +5558 @@
          '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) : MySuperClass()
@@ -5583 +5597 @@
         { }''',
         'Missing spaces around :  [whitespace/init] [4]')
+
         self.assert_multi_line_lint('''\
         MyClass::MyClass(Document* doc)
@@ -5590 +5605 @@
         'Comma should be at the beginning of the line in a member initialization list.'
         '  [whitespace/init] [4]')
+
         self.assert_multi_line_lint('''\
         class MyClass : public Goo {
         };''',
         '')
+
         self.assert_multi_line_lint('''\
         class MyClass
@@ -5600 +5617 @@
         };''',
         '')
+
         self.assert_multi_line_lint('''\
         MyClass::MyClass(Document* doc)
@@ -5605 +5623 @@
         { }''',
         '')
+
+        self.assert_multi_line_lint('''\
+            PreviewConverter::PreviewConverter(NSData *data, const String& uti, const String& password)
+                : m_platformConverter { adoptNS([allocQLPreviewConverterInstance() initWithData:data name:nil uti:uti options:optionsWithPassword(password)]) }
+            { }''',
+            '')
+
         self.assert_lint('::ShowWindow(m_overlay);', '')
+
         self.assert_lint('o = foo(b ? bar() : baz());', '')
+
         self.assert_lint('MYMACRO(a ? b() : c);', '')