web_dev_style: ignore --css-vars from alphabetical ordering requirement

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):
+      s = _remove_ats(s)
       s = _remove_grit(s)
-      s = _remove_ats(s)
       s = _remove_comments(s)
+      s = _remove_mixins(s)
       s = _remove_template_expressions(s)
-      s = _remove_mixins(s)
+      s = _remove_vars(s)
       return s
 
     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_mixins(s):
       return re.sub(re.compile(r'--[\d\w-]+: {.*?};', re.DOTALL), '', s)
 
-    def _remove_template_expressions(s):
-      return re.sub(re.compile(r'\${[^}]*}', re.DOTALL), '', s)
-
     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 _remove_template_expressions(s):
+      return re.sub(re.compile(r'\${[^}]*}', re.DOTALL), '', s)
+
+    def _remove_vars(s):
+      return re.sub(re.compile(r'--[\d\w-]+: [^;]+?;', re.DOTALL), '', s);

[dschuyler, 2016/09/15 23:17:36]

How about entries like this
--foo: {
  option: choice;
};

I think it may leave the "};"

[dschuyler, 2016/09/15 23:17:36]

I think the \d isn't needed (if I'm wrong on
that it would help me to know).

[Dan Beam, 2016/09/15 23:30:17]

does that mean you want me to combine this with _remove_mixins?

[dschuyler, 2016/09/15 23:48:35]

Ah, I see it now. Maybe just a comment saying that 
_remove_mixins() should be run prior this function.
Though my preference would be to combine them because
it makes the order clear an removes a function call.
Either is good with me.

Mostly my comment was me not noticing that the mixins
would have already been removed.

[Dan Beam, 2016/09/17 02:06:19]

Done.

[dschuyler, 2016/09/19 21:23:28]

I'm pretty sure \d is redundant with \w within
a [] block.

[Dan Beam, 2016/09/22 02:13:25]

Done.

+
     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 _strip_prefix(s):
       return re.sub(r'^-(?:o|ms|moz|khtml|webkit)-', '', s)
 
@@ skipping 328 matching lines @@
                 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