Changeset 161535 in webkit

Timestamp:

Jan 8, 2014 6:13:07 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Missleading style error when mixing system and non-system header include lines.
​https://bugs.webkit.org/show_bug.cgi?id=126564

Patch by Gergo Balogh <​geryxyz@inf.u-szeged.hu> on 2014-01-08
Reviewed by Ryosuke Niwa.

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

(check_include_line):

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

(OrderOfIncludesTest.test_check_alphabetical_include_order):
(OrderOfIncludesTest.test_public_primary_header):

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

trunk/Tools/ChangeLog

@@ +1 @@
+2014-01-08  Gergo Balogh  <geryxyz@inf.u-szeged.hu>
+
+        Missleading style error when mixing system and non-system header include lines.
+        https://bugs.webkit.org/show_bug.cgi?id=126564
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_include_line):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (OrderOfIncludesTest.test_check_alphabetical_include_order):
+        (OrderOfIncludesTest.test_public_primary_header):
+
 2014-01-08  Seokju Kwon  <seokju@webkit.org>
 

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

@@ -2917 +2917 @@
          if previous_match:
             previous_header_type = include_state.header_types[previous_line_number]
-            if previous_header_type == _OTHER_HEADER and previous_line.strip() > line.strip():
-                # This type of error is potentially a problem with this line or the previous one,
-                # so if the error is filtered for one line, report it for the next. This is so that
-                # we properly handle patches, for which only modified lines produce errors.
-                if not error(line_number - 1, 'build/include_order', 4, 'Alphabetical sorting problem.'):
-                    error(line_number, 'build/include_order', 4, 'Alphabetical sorting problem.')
+            if previous_header_type == _OTHER_HEADER:
+                if '<' in previous_line and '"' in line:
+                    error(line_number, 'build/include_order', 4, 'Bad include order. Mixing system and custom headers.')
+                elif previous_line.strip() > line.strip():
+                    # This type of error is potentially a problem with this line or the previous one,
+                    # so if the error is filtered for one line, report it for the next. This is so that
+                    # we properly handle patches, for which only modified lines produce errors.
+                    if not error(line_number - 1, 'build/include_order', 4, 'Alphabetical sorting problem.'):
+                        error(line_number, 'build/include_order', 4, 'Alphabetical sorting problem.')
 
     if error_message:

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

@@ -2624 +2624 @@
                                          '#include <assert.h>\n'
                                          '#include "bar.h"\n',
-                                         'Alphabetical sorting problem.  [build/include_order] [4]')
+                                         'Bad include order. Mixing system and custom headers.  [build/include_order] [4]')
 
         self.assert_language_rules_check('foo.h',
@@ -2776 +2776 @@
                                          '\n'
                                          '#include "a.h"\n',
-                                         'Alphabetical sorting problem.  [build/include_order] [4]')
+                                         'Bad include order. Mixing system and custom headers.  [build/include_order] [4]')
 
         # ...except that it starts with public/.
@@ -2792 +2792 @@
                                          '\n'
                                          '#include "a.h"\n',
-                                         'Alphabetical sorting problem.  [build/include_order] [4]')
+                                         'Bad include order. Mixing system and custom headers.  [build/include_order] [4]')
 
     def test_check_wtf_includes(self):