implement Brackets node

csstree · Jan 14, 2017 · 6ba79d3 · 6ba79d3
1 parent 5255538
commit 6ba79d3
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 3 deletions.
diff --git a/lib/parser/index.js b/lib/parser/index.js
@@ -534,6 +534,10 @@ function getValue(nested, property) {
                 child = getParentheses(SCOPE_VALUE);
                 break;
 
+            case LEFTSQUAREBRACKET:
+                child = getBrackets();
+                break;
+
             case STRING:
                 child = getString();
                 break;
@@ -716,7 +720,7 @@ function getParentheses(scope) {
     var wasSpace = false;
     var child;
 
-    // left brace
+    // left parenthesis
     scanner.eat(LEFTPARENTHESIS);
     readSC();
 
@@ -766,7 +770,7 @@ function getParentheses(scope) {
         children.appendData(child);
     }
 
-    // right brace
+    // right parenthesis
     scanner.eat(RIGHTPARENTHESIS);
 
     return {
@@ -776,6 +780,56 @@ function getParentheses(scope) {
     };
 }
 
+// currently only Grid Layout uses square brackets
+// https://drafts.csswg.org/css-grid/#track-sizing
+// [ ident* ]
+function getBrackets() {
+    var start = scanner.tokenStart;
+    var children = new List();
+    var wasSpace = false;
+    var child;
+
+    // left bracket
+    scanner.eat(LEFTSQUAREBRACKET);
+    readSC();
+
+    scan:
+    while (!scanner.eof) {
+        switch (scanner.tokenType) {
+            case RIGHTSQUAREBRACKET:
+                break scan;
+
+            case WHITESPACE:
+                wasSpace = true;
+                scanner.next();
+                continue;
+
+            case COMMENT: // ignore comments
+                scanner.next();
+                continue;
+
+            default:
+                child = getIdentifier(false);
+        }
+
+        if (wasSpace) {
+            wasSpace = false;
+            children.appendData(SPACE_NODE);
+        }
+
+        children.appendData(child);
+    }
+
+    // right bracket
+    scanner.eat(RIGHTSQUAREBRACKET);
+
+    return {
+        type: 'Brackets',
+        info: getInfo(start),
+        children: children
+    };
+}
+
 // '.' ident
 function getClass() {
     var start = scanner.tokenStart;

diff --git a/lib/utils/translate.js b/lib/utils/translate.js
@@ -152,6 +152,9 @@ function translate(node) {
         case 'Parentheses':
             return '(' + each(node.children) + ')';
 
+        case 'Brackets':
+            return '[' + each(node.children) + ']';
+
         case 'AtruleExpression':
             return each(node.children);
 

diff --git a/lib/utils/translateWithSourceMap.js b/lib/utils/translateWithSourceMap.js
@@ -226,6 +226,9 @@ function translate(node) {
         case 'Parentheses':
             return '(' + each(node.children) + ')';
 
+        case 'Brackets':
+            return '[' + each(node.children) + ']';
+
         case 'AtruleExpression':
             return each(node.children);
 

diff --git a/lib/utils/walk.js b/lib/utils/walk.js
@@ -183,9 +183,9 @@ function walk(walk, node) {
             break;
 
         case 'Value':
-        case 'Argument':
         case 'SimpleSelector':
         case 'Parentheses':
+        case 'Brackets':
         case 'Negation':
             node.children.each(walk, this);
             break;

diff --git a/test/fixture/parse/value/Brackets.json b/test/fixture/parse/value/Brackets.json
@@ -0,0 +1,40 @@
+{
+    "empty": {
+        "source": "[]",
+        "ast": {
+            "type": "Brackets",
+            "children": []
+        }
+    },
+    "single identifier": {
+        "source": "[foo]",
+        "ast": {
+            "type": "Brackets",
+            "children": [
+                {
+                    "type": "Identifier",
+                    "name": "foo"
+                }
+            ]
+        }
+    },
+    "multiple identifier": {
+        "source": "[foo bar]",
+        "ast": {
+            "type": "Brackets",
+            "children": [
+                {
+                    "type": "Identifier",
+                    "name": "foo"
+                },
+                {
+                    "type": "Space"
+                },
+                {
+                    "type": "Identifier",
+                    "name": "bar"
+                }
+            ]
+        }
+    }
+}