[ui/base;css] adding string template expression replacement

chrome/browser/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 depot_tools, and see
 http://www.chromium.org/developers/web-development-style-guide for the rules
 we're checking against here.
@@ skipping 11 matching lines @@
     # 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)))
+      return _remove_grit(_remove_ats(_remove_comments(
+          _remove_replacement_tags(s))))

[Dan Beam, 2015/07/09 19:26:01]

maybe it's time to do:

  tmp = s
  tmp = _remove_grit(tmp)
  tmp = _remove_ats(tmp)
  tmp = _remove_comments(tmp)
  tmp = _remove_template_expressions(tmp)
  return tmp

[dschuyler, 2015/07/14 00:56:17]

Done.

 
     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):
       return re.sub(re.compile(r'/\*.*?\*/', re.DOTALL), '', s)
 
+    def _remove_replacement_tags(s):

[Dan Beam, 2015/07/09 19:26:01]

nit: _remove_template_expressions

[dschuyler, 2015/07/14 00:56:17]

Done.

+      return re.sub(re.compile(r'\${[^}]*}', re.DOTALL), '', s)

[Dan Beam, 2015/07/09 19:26:01]

can haz test in chrome/browser/test_presubmit.py?

+
     def _remove_grit(s):
       grit_reg = re.compile(r"""
           <if[^>]+>.*?<\s*/\s*if[^>]*>|  # <if> contents </if>
           <include[^>]+>                 # <include>
           """,
           re.DOTALL | re.VERBOSE)
       return re.sub(grit_reg, '', s)
 
     def _rgb_from_hex(s):
       if len(s) == 3:
@@ skipping 340 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