Changeset 260659 in webkit

Timestamp:

Apr 24, 2020 11:42:53 AM (4 years ago)

Author:

ddkilzer@apple.com

Message:

check-webkit-style should recognize *Internal.h and *Private.h as primary headers
<​https://webkit.org/b/210979>

Reviewed by Darin Adler.

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

(_classify_include): If a header has an "Internal.h" or a
"Private.h" suffix with the same base name as the source file,
consider it a primary header--the header that comes after
"config.h".

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

(OrderOfIncludesTest.test_classify_include): Add tests.

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 @@
+2020-04-24  David Kilzer  <ddkilzer@apple.com>
+
+        check-webkit-style should recognize *Internal.h and *Private.h as primary headers
+        <https://webkit.org/b/210979>
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (_classify_include): If a header has an "Internal.h" or a
+        "Private.h" suffix with the same base name as the source file,
+        consider it a primary header--the header that comes after
+        "config.h".
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (OrderOfIncludesTest.test_classify_include): Add tests.
+
 2020-04-24  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -3225 +3225 @@
     if not include_state.visited_primary_section():
         if target_base.find(include_base) != -1:
+            return _PRIMARY_HEADER
+        if include_base in ['{}Internal'.format(target_base), '{}Private'.format(target_base)]:
             return _PRIMARY_HEADER
 

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

@@ -3558 +3558 @@
                                          '#include "ResourceHandleWin.h"\n',
                                          '')
+        # Internal.h and Private.h headers are primary headers.
+        self.assertEqual(cpp_style._PRIMARY_HEADER,
+                         classify_include('WKWebProcessPlugInNodeHandle.mm',
+                                          'WKWebProcessPlugInNodeHandleInternal.h',
+                                          False, include_state))
+        self.assertEqual(cpp_style._PRIMARY_HEADER,
+                         classify_include('WKWebProcessPlugInNodeHandle.mm',
+                                          'WKWebProcessPlugInNodeHandlePrivate.h',
+                                          False, include_state))
 
     def test_try_drop_common_suffixes(self):