Add support for inline CSS in HTML files to CSS Presubmit checker

chrome/browser/web_dev_style/css_checker.py

 # Copyright 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 depot_tools, and see
 http://www.chromium.org/developers/web-development-style-guide for the rules
 we're checking against here.
@@ skipping 18 matching lines @@
       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):
       s = _remove_grit(s)
       s = _remove_ats(s)
       s = _remove_comments(s)
       s = _remove_template_expressions(s)
       s = _remove_mixins(s)
       return s
 
+    def _extract_inline_style(s):
+      style_reg = re.compile(r"""<style>([^<]*)<\/style>""")
+      styles = style_reg.findall(s)
+      return '\n'.join(styles)

[Dan Beam, 2016/01/27 02:50:45]

nit: to improve your code golf swing

  return '\n'.join(re.compile(r'<style>([^<]*)<\/style>').findall(s))

[tsergeant, 2016/01/27 03:12:14]

Done, one-upping by getting rid of the compile.

+
     def _remove_ats(s):
       at_reg = re.compile(r"""
           @(?!\d+x\b)\w+[^'"]*?{  # @at-keyword selector junk {, not @2x
           (.*{.*?})+              # inner { curly } blocks, rules, and selector
           .*?}                    # stuff up to the first end curly }
           """,
           re.DOTALL | re.VERBOSE)
       return at_reg.sub('\\1', s)
 
     def _remove_comments(s):
@@ skipping 319 matching lines @@
           'test': zero_width_lengths,
           'multiline': True,
         },
     ]
 
     results = []
     affected_files = self.input_api.AffectedFiles(include_deletes=False,
                                                   file_filter=self.file_filter)
     files = []
     for f in affected_files:
-      # 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))
+      file_contents = '\n'.join(f.NewContents())
+      path = f.LocalPath()
+      # Handle CSS files and HTML files with inline styles.
+      if path.endswith('.html'):
+        file_contents = _extract_inline_style(file_contents)

[Dan Beam, 2016/01/27 02:50:45]

nit: \n

[tsergeant, 2016/01/27 03:12:14]

Done.

+      if path.endswith('.html') or path.endswith('.css'):
+        # 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(file_contents)
+        files.append((path, file_contents))
 
-    # Only look at CSS files for now.
-    for f in filter(lambda f: f[0].endswith('.css'), files):
+    for f in 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']):
           assert not 'after' in check
           check_errors = check['test'](f[1])
           if len(check_errors) > 0:
             file_errors.append('- %s\n%s' %
                 (check['desc'], '\n'.join(check_errors).rstrip()))
         else:
           check_errors = []
           lines = f[1].splitlines()
           for lnum, line in enumerate(lines):
             if check['test'](line):
               error = '    ' + line.strip()
               if 'after' in check:
                 error += check['after'](line)
               check_errors.append(error)
           if len(check_errors) > 0:
             file_errors.append('- %s\n%s' %
                 (check['desc'], '\n'.join(check_errors)))
       if file_errors:
         results.append(self.output_api.PresubmitPromptWarning(
             '%s:\n%s' % (f[0], '\n\n'.join(file_errors))))
 
     return results