fix parsing var() fallback value when parseCustomProperty is true

csstree · Feb 5, 2017 · 5526817 · 5526817
1 parent 11412b1
commit 5526817
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 1 deletion.
diff --git a/lib/parser/function/var.js b/lib/parser/function/var.js
@@ -26,7 +26,10 @@ module.exports = function getVarFunction() {
 
     if (this.scanner.tokenType === COMMA) {
         children.appendData(this.Operator());
-        children.appendData(this.Raw(BALANCED, HYPHENMINUS, EXCLAMATIONMARK));
+        children.appendData(this.parseCustomProperty
+            ? this.Value(null)
+            : this.Raw(BALANCED, HYPHENMINUS, EXCLAMATIONMARK)
+        );
     }
 
     return children;

diff --git a/test/fixture/parse/value/Value.json b/test/fixture/parse/value/Value.json
@@ -144,6 +144,29 @@
             ]
         }
     },
+    "should parse a custom property value when parseCustomProperty is true": {
+        "options": {
+            "property": "--var",
+            "parseCustomProperty": true
+        },
+        "source": "1 foo",
+        "ast": {
+            "type": "Value",
+            "children": [
+                {
+                    "type": "Number",
+                    "value": "1"
+                },
+                {
+                    "type": "Space"
+                },
+                {
+                    "type": "Identifier",
+                    "name": "foo"
+                }
+            ]
+        }
+    },
     "error": [
         {
             "comment": "closing parenthesis is not allowed",

diff --git a/test/fixture/parse/value/function/var.json b/test/fixture/parse/value/function/var.json
@@ -160,6 +160,43 @@
             ]
         }
     },
+    "should parse a fallback value when parseCustomProperty is true": {
+        "options": {
+            "parseCustomProperty": true
+        },
+        "source": "var(--foo, 1 foo)",
+        "translate": "var(--foo,1 foo)",
+        "ast": {
+            "type": "Function",
+            "name": "var",
+            "children": [
+                {
+                    "type": "Identifier",
+                    "name": "--foo"
+                },
+                {
+                    "type": "Operator",
+                    "value": ","
+                },
+                {
+                    "type": "Value",
+                    "children": [
+                        {
+                            "type": "Number",
+                            "value": "1"
+                        },
+                        {
+                            "type": "Space"
+                        },
+                        {
+                            "type": "Identifier",
+                            "name": "foo"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
     "error #1": {
         "source": "var(name)",
         "offset": "    ^",