Changeset 170565 in webkit

Timestamp:

Jun 27, 2014, 10:51:13 PM (11 years ago)

Author:

timothy_horton@apple.com

Message:

check-webkit-style should check the order of #imports as well as #includes
​https://bugs.webkit.org/show_bug.cgi?id=134428

Reviewed by Dan Bernstein.

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

Allow "import" in addition to "include", so that the sort order of headers in ObjC files is checked.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-06-27  Tim Horton  <timothy_horton@apple.com>
+
+        check-webkit-style should check the order of #imports as well as #includes
+        https://bugs.webkit.org/show_bug.cgi?id=134428
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        Allow "import" in addition to "include", so that the sort order of headers in ObjC files is checked.
+
 2014-06-27  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
 

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

@@ -2772 +2772 @@
 
 
-_RE_PATTERN_INCLUDE_NEW_STYLE = re.compile(r'#include +"[^/]+\.h"')
-_RE_PATTERN_INCLUDE = re.compile(r'^\s*#\s*include\s*([<"])([^>"]*)[>"].*$')
+_RE_PATTERN_INCLUDE_NEW_STYLE = re.compile(r'#(?:include|import) +"[^/]+\.h"')
+_RE_PATTERN_INCLUDE = re.compile(r'^\s*#\s*(?:include|import)\s*([<"])([^>"]*)[>"].*$')
 # Matches the first component of a filename delimited by -s and _s. That is:
 #  _RE_FIRST_COMPONENT.match('foo').group(0) == 'foo'