Remove header ordering checks from check-webkit-style

third_party/WebKit/Tools/Scripts/webkitpy/style/checkers/cpp.py

 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009, 2010, 2012 Google Inc. All rights reserved.
 # Copyright (C) 2009 Torch Mobile Inc.
 # Copyright (C) 2009 Apple Inc. All rights reserved.
 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org)
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
@@ skipping 2551 matching lines @@
 
     duplicate_header = include in include_state
     if duplicate_header:
         error(line_number, 'build/include', 4,
               '"%s" already included at %s:%s' %
               (include, filename, include_state[include]))
     else:
         include_state[include] = line_number
 
     header_type = _classify_include(filename, include, is_system, include_state)
     primary_header_exists = _does_primary_header_exist(filename)

[dcheng, 2017/03/17 05:37:29]

I think this can be removed (and possibly header_type/header_types below as
well)

[alancutter (OOO until 2018), 2017/03/19 23:12:48]

Yep, removed.

     include_state.header_types[line_number] = header_type
 
-    # Only proceed if this isn't a duplicate header.
-    if duplicate_header:
-        return
-
-    # We want to ensure that headers appear in the right order:
-    # 1) for implementation files: primary header, blank line, alphabetically sorted
-    # 2) for header files: alphabetically sorted
-    # The include_state object keeps track of the last type seen
-    # and complains if the header types are out of order or missing.
-    error_message = include_state.check_next_include_order(header_type,
-                                                           file_extension == 'h',
-                                                           primary_header_exists)
-
-    # Check to make sure we have a blank line after primary header.
-    if not error_message and header_type == _PRIMARY_HEADER:
-        next_line = clean_lines.raw_lines[line_number + 1]
-        if not is_blank_line(next_line):
-            error(line_number, 'build/include_order', 4,
-                  'You should add a blank line after implementation file\'s own header.')
-
-    if error_message:
-        if file_extension == 'h':
-            error(line_number, 'build/include_order', 4,
-                  '%s Should be: alphabetically sorted.' %
-                  error_message)
-        else:
-            error(line_number, 'build/include_order', 4,
-                  '%s Should be: primary header, blank line, and then alphabetically sorted.' %
-                  error_message)
-
 
 def check_language(filename, clean_lines, line_number, file_extension, include_state,
                    file_state, error):
     """Checks rules from the 'C++ language rules' section of cppguide.html.
 
     Some of these rules are hard to test (function overloading, using
     uint32 inappropriately), but we do the best we can.
 
     Args:
       filename: The name of the current file.
@@ skipping 968 matching lines @@
 
     def check(self, lines):
         _process_lines(self.file_path, self.file_extension, lines,
                        self.handle_style_error, self.min_confidence)
 
 
 # FIXME: Remove this function (requires refactoring unit tests).
 def process_file_data(filename, file_extension, lines, error, min_confidence, fs=None):
     checker = CppChecker(filename, file_extension, error, min_confidence, fs)
     checker.check(lines)