Changeset 164806 in webkit

Timestamp:

Feb 27, 2014 9:02:13 AM (10 years ago)

Author:

lvidacs.u-szeged@partner.samsung.com

Message:

check-webkit-style indentation false alarm in WebKit/win/WebNodeHighlight.cpp
​https://bugs.webkit.org/show_bug.cgi?id=127076

Reviewed by Anders Carlsson.

Avoid match for :: as start of a member initialization list. Modify expression to match
after a colon either non-colon character or end of line.

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

(check_member_initialization_list):

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

(WebKitStyleTest.test_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-02-27  Laszlo Vidacs  <lvidacs.u-szeged@partner.samsung.com>
+
+        check-webkit-style indentation false alarm in WebKit/win/WebNodeHighlight.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=127076
+
+        Reviewed by Anders Carlsson.
+
+        Avoid match for :: as start of a member initialization list. Modify expression to match
+        after a colon either non-colon character or end of line.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_member_initialization_list):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_member_initialization_list):
+
 2014-02-27  Renata Hodovan  <rhodovan.u-szeged@partner.samsung.com>
 

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

@@ -2007 +2007 @@
     begin_line = line
     # match the start of initialization list
-    if search(r'^(?P<indentation>\s*)((explicit\s+)?[^(\s|\?)]+\([^\?]*\)\s?\:|^(\s|\?)*\:).*[^;]*$', line):
+    if search(r'^(?P<indentation>\s*)((explicit\s+)?[^(\s|\?)]+\([^\?]*\)\s?\:|^(\s|\?)*\:)([^\:]|\Z)[^;]*$', line):
         if search(r'[^:]\:[^\:\s]+', line):
             error(line_number, 'whitespace/init', 4,

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

@@ -5020 +5020 @@
         { }''',
         '')
+        self.assert_lint('::ShowWindow(m_overlay);', '')
         self.assert_lint('o = foo(b ? bar() : baz());', '')
         self.assert_lint('MYMACRO(a ? b() : c);', '')