From a997ecbe248a2de5e2b3bfc76008d51c1db1a912 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Mon, 2 Nov 2020 22:08:14 +0300
Subject: [PATCH] update CSSLint

* fix missing <zero>
* retry/consume attr()
* code cosmetics
---
 vendor-overwrites/csslint/parserlib.js | 71 +++++++++++++++-----------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/vendor-overwrites/csslint/parserlib.js b/vendor-overwrites/csslint/parserlib.js
index b8a631fd..34a9af64 100644
--- a/vendor-overwrites/csslint/parserlib.js
+++ b/vendor-overwrites/csslint/parserlib.js
@@ -725,9 +725,11 @@ self.parserlib = (() => {
       },
 
       '<angle>': part => part.type === 'angle',
+      '<angle-or-0>': p => p.type === 'angle' || p.text === '0',
 
       '<aspect-ratio>': part => part.units && lowerCmp(part.units, 'ar'),
 
+      '<attr>': p => p.type === 'function' && lowerCmp(p.name, 'attr'),
       '<attr-fallback>': part => !/\battr\(/i.test(part.text),
 
       '<attachment>': 'scroll | fixed | local',
@@ -1153,7 +1155,7 @@ self.parserlib = (() => {
       'contrast':    '<number-percentage>',
       'drop-shadow': '<length>{2,3} && <color>?',
       'grayscale':   '<number-percentage>',
-      'hue-rotate':  '<angle> | <zero>',
+      'hue-rotate':  '<angle-or-0>',
       'invert':      '<number-percentage>',
       'opacity':     '<number-percentage>',
       'saturate':    '<number-percentage>',
@@ -1172,17 +1174,17 @@ self.parserlib = (() => {
       'scale':      '<number> [ , <number> ]?',
       'scaleX':     '<number>',
       'scaleY':     '<number>',
-      'rotate':     '[ <angle> | <zero> ]',
-      'skew':       '[ <angle> | <zero> ] [ , [ <angle> | <zero> ] ]?',
-      'skewX':      '[ <angle> | <zero> ]',
-      'skewY':      '[ <angle> | <zero> ]',
+      'rotate':     '<angle-or-0>',
+      'skew':       '<angle-or-0> [ , <angle-or-0> ]?',
+      'skewX':      '<angle-or-0>',
+      'skewY':      '<angle-or-0>',
 
       'matrix3d':    '<number>#{16}',
       'translate3d': '<length-percentage>#{2} , <length>',
       'translateZ':  '<length>',
       'scale3d':     '<number>#{3}',
       'scaleZ':      '<number>',
-      'rotate3d':    '<number>#{3} , [ <angle> | <zero> ]',
+      'rotate3d':    '<number>#{3} , <angle-or-0>',
     },
 
     functionsMayBeEmpty: new Set([
@@ -2728,18 +2730,18 @@ self.parserlib = (() => {
     },
 
     /**
-     * @param {PropertyValueIterator} expression
+     * @param {PropertyValueIterator} expr
      * @param {string} type
      * @return {?boolean}
      */
-    isType(expression, type) {
-      const part = expression.peek();
+    isType(expr, type) {
+      const part = expr.peek();
       let result, m;
 
       if (this.simple['<var>'](part)) {
-        if (expression._i < expression._parts.length - 1) {
-          expression.mark().next();
-          expression.popMark(ValidationTypes.isType(expression, type));
+        if (expr._i < expr._parts.length - 1) {
+          expr.mark().next();
+          expr.popMark(ValidationTypes.isType(expr, type));
         }
         result = true;
 
@@ -2752,14 +2754,14 @@ self.parserlib = (() => {
       } else {
         m = this.complex[type];
         return m instanceof Matcher ?
-          m.match(expression) :
-          m.call(this.complex, expression);
+          m.match(expr) :
+          m.call(this.complex, expr);
       }
 
-      if (!result && part.type === 'function' && lowerCmp(part.name, 'attr')) {
+      if (!result && expr.tryAttr && part.type === 'function' && lowerCmp(part.name, 'attr')) {
         result = ValidationTypes.isFunction('attr', part);
       }
-      if (result) expression.next();
+      if (result) expr.next();
       return result;
     },
 
@@ -2823,21 +2825,30 @@ self.parserlib = (() => {
     if (!spec) throw new ValidationError(`Unknown property '${property}'.`, property);
 
     // Property-specific validation.
-    const expression = new PropertyValueIterator(value);
-    const result = Matcher.parse(spec).match(expression);
-
-    const hasNext = expression.hasNext();
-    if (result) {
-      if (hasNext) throwEndExpected(expression.next());
-
-    } else {
-      if (hasNext && expression._i) {
-        throwEndExpected(expression.peek());
-      } else {
-        const {text} = expression.value;
-        throw new ValidationError(`Expected '${ValidationTypes.describe(spec)}' but found '${text}'.`,
-          expression.value);
+    const expr = new PropertyValueIterator(value);
+    const tryAttr = /\battr\(/i.test(value.text);
+    const m = Matcher.parse(spec);
+    let result = m.match(expr);
+    if (tryAttr) {
+      if (!result) {
+        expr.tryAttr = true;
+        expr._i = 0;
+        result = m.match(expr);
       }
+      while (expr.hasNext() &&
+          ValidationTypes.simple['<attr>'](expr.peek()) &&
+          ValidationTypes.isFunction('attr', expr.peek())) {
+        expr.next();
+      }
+    }
+    if (result) {
+      if (expr.hasNext()) throwEndExpected(expr.next());
+    } else if (expr.hasNext() && expr._i) {
+      throwEndExpected(expr.peek());
+    } else {
+      const {text} = expr.value;
+      throw new ValidationError(`Expected '${ValidationTypes.describe(spec)}' but found '${text}'.`,
+        expr.value);
     }
 
     if (!known) validationCache.set(prop, (known = new Set()));