[WebUI] Make CSS presubmit play nice with grit XML.

chrome/browser/resources/web_dev_style/css_checker.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Presubmit script for Chromium WebUI resources.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl/git cl, and see
 http://www.chromium.org/developers/web-development-style-guide for the rules
 we're checking against here.
@@ skipping 10 matching lines @@
   def RunChecks(self):
     # We use this a lot, so make a nick name variable.
     re = self.input_api.re
 
     def _collapseable_hex(s):
       return (len(s) == 6 and s[0] == s[1] and s[2] == s[3] and s[4] == s[5])
 
     def _is_gray(s):
       return s[0] == s[1] == s[2] if len(s) == 3 else s[0:2] == s[2:4] == s[4:6]
 
+    def _remove_all(s):
+      return _remove_grit(_remove_ats(_remove_comments(s)))
+
     def _remove_ats(s):
       return re.sub(re.compile(r'@\w+.*?{(.*{.*?})+.*?}', re.DOTALL), '\\1', s)
 
     def _remove_comments(s):
       return re.sub(re.compile(r'/\*.*?\*/', re.DOTALL), '', s)
 
+    def _remove_grit(s):
+      grit_reg = r'<if[^>]*>.*<\s*/\s*if[^>]*>|<include[^>]+>'
+      return re.sub(re.compile(grit_reg, re.DOTALL), '', s)
+
     def _rgb_from_hex(s):
       if len(s) == 3:
         r, g, b = s[0] + s[0], s[1] + s[1], s[2] + s[2]
       else:
         r, g, b = s[0:2], s[2:4], s[4:6]
       return int(r, base=16), int(g, base=16), int(b, base=16)
 
     def alphabetize_props(contents):
       errors = []
       for rule in re.finditer(r'{(.*?)}', contents, re.DOTALL):
-        rules = filter(lambda r: r.find(': ') >= 0,
-                       map(lambda t: t.strip(), rule.group(1).split(';'))[0:-1])
+        semis = map(lambda t: t.strip(), rule.group(1).split(';'))[0:-1]

[Dirk Pranke, 2012/03/22 03:05:30]

isn't list[0:-1] == list ? can you just remove the [0:-1] ?

[Dan Beam, 2012/03/22 03:19:31]

removed 0, so [:-1] like we talked about in IRC

+        rules = filter(lambda r: r.find(': ') >= 0, semis)

[Dirk Pranke, 2012/03/22 03:05:30]

Nit: this can be filter(lamba r: ': ' in r, semis)

[Dan Beam, 2012/03/22 03:19:31]

Done.

         props = map(lambda r: r[0:r.find(':')], rules)
         if props != sorted(props):
           errors.append('    %s;\n' % (';\n    '.join(rules)))
       return errors
 
     def braces_have_space_before_and_nothing_after(line):
       return re.search(r'(?:^|\S){|{\s*\S+\s*$', line)
 
     def classes_use_dashes(line):
       # Intentionally dumbed down version of CSS 2.1 grammar for class without
@@ skipping 104 matching lines @@
                   'hsl() or part of @keyframe.',
           'test': zero_length_values,
         },
     ]
 
     results = []
     affected_files = self.input_api.AffectedFiles(include_deletes=False,
                                                   file_filter=self.file_filter)
     files = []
     for f in affected_files:
-      # Remove all /*comments*/ and @at-keywords; we're not using a real parser.
-      file_contents = _remove_ats(_remove_comments('\n'.join(f.NewContents())))
+      # Remove all /*comments*/, @at-keywords, and grit <if|include> tags; we're
+      # not using a real parser. TODO(dbeam): Check alpha in <if> blocks.
+      file_contents = _remove_all('\n'.join(f.NewContents()))
       files.append((f.LocalPath(), file_contents))
 
     # Only look at CSS files for now.
     for f in filter(lambda f: f[0].endswith('.css'), files):
       file_errors = []
       for check in added_or_modified_files_checks:
         # If the check is multiline, it receieves the whole file and gives us
         # back a list of things wrong. If the check isn't multiline, we pass it
         # each line and the check returns something truthy if there's an issue.
         if ('multiline' in check and check['multiline']):
@@ skipping 20 matching lines @@
             '%s:\n%s' % (f[0], '\n\n'.join(file_errors))))
 
     if results:
       # Add your name if you're here often mucking around in the code.
       authors = ['dbeam@chromium.org']
       results.append(self.output_api.PresubmitNotifyResult(
           'Was the CSS checker useful? Send feedback or hate mail to %s.' %
           ', '.join(authors)))
 
     return results