support for css variables (fixes #279)

css · Mar 9, 2016 · a06c343 · a06c343
1 parent cba0fc3
commit a06c343
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 6 deletions.
diff --git a/lib/parser/index.js b/lib/parser/index.js
@@ -964,11 +964,13 @@ function getVarFunctionBody() {
  var node = [getInfo(pos), NodeType.FunctionBodyType];
 
  readSC(node);
- node.push(readIdent(true));
+ node.push(getIdentifier(true));
 
  if (pos < tokens.length && tokens[pos].type === TokenType.Comma) {
- pos++;
- node.push(getValue(true));
+ node.push(
+ getOperator(),
+ getValue(true)
+ );
  readSC(node);
  }
 
@@ -1155,8 +1157,8 @@ function getNamespacedIdentifier(checkColon) {
  ];
 }
 
-function getIdentifier() {
- return [getInfo(pos), NodeType.IdentType, readIdent()];
+function getIdentifier(varAllowed) {
+ return [getInfo(pos), NodeType.IdentType, readIdent(varAllowed)];
 }
 
 // ! ws* important

diff --git a/test/fixture/compress/variables.min.css b/test/fixture/compress/variables.min.css
diff --git a/test/fixture/internal/value.json b/test/fixture/internal/value.json
@@ -352,6 +352,46 @@
  ]
  }
  },
+ "css variables": {
+ "source": "var(--foo, blue)",
+ "translate": "var(--foo,blue)",
+ "ast": {
+ "type": "Value",
+ "important": false,
+ "sequence": [
+ {
+ "type": "Function",
+ "name": "var",
+ "arguments": [
+ {
+ "type": "Argument",
+ "sequence": [
+ {
+ "type": "Identifier",
+ "name": "--foo"
+ }
+ ]
+ },
+ {
+ "type": "Argument",
+ "sequence": [
+ {
+ "type": "Value",
+ "important": false,
+ "sequence": [
+ {
+ "type": "Identifier",
+ "name": "blue"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ },
  "important.0": {
  "source": "#123456 !important",
  "translate": "#123456!important",