Merge pull request #697 from Cerdic/Issue/leafo/542

Issue/leafo/542

Author: robocoder

src/Parser.php

@@ -1270,7 +1270,10 @@ protected function expression(&$out)
         }
 
         if ($this->matchChar('[')) {
-            if ($this->parenExpression($out, $s, "]")) {
+            if ($this->parenExpression($out, $s, "]", [Type::T_LIST, Type::T_KEYWORD])) {
+                if ($out[0] !== Type::T_LIST && $out[0] !== Type::T_MAP) {
+                    $out = [Type::T_STRING, '', [ '[', $out, ']' ]];
+                }
                 return true;
             }
 
@@ -1292,24 +1295,25 @@ protected function expression(&$out)
      * @param array   $out
      * @param integer $s
      * @param string  $closingParen
+     * @param array   $allowedTypes
      *
      * @return boolean
      */
-    protected function parenExpression(&$out, $s, $closingParen = ")")
+    protected function parenExpression(&$out, $s, $closingParen = ")", $allowedTypes = [Type::T_LIST, Type::T_MAP])
     {
         if ($this->matchChar($closingParen)) {
             $out = [Type::T_LIST, '', []];
 
             return true;
         }
 
-        if ($this->valueList($out) && $this->matchChar($closingParen) && $out[0] === Type::T_LIST) {
+        if ($this->valueList($out) && $this->matchChar($closingParen) && in_array($out[0], $allowedTypes)) {
             return true;
         }
 
         $this->seek($s);
 
-        if ($this->map($out)) {
+        if (in_array(Type::T_MAP, $allowedTypes) && $this->map($out)) {
             return true;
         }
 

tests/inputs/values.scss

@@ -15,6 +15,7 @@ multiline block \
     content: "This is a \
 multiline string.";
     border-radius: -1px -1px -1px black;
+    grid-template-columns: [avatar] 2fr [body] 6fr;
 }
 
 #subtraction {

tests/outputs/values.css

@@ -13,7 +13,8 @@ multiline block \
   margin: 4, 3, 1;
   content: "This is a \
 multiline string.";
-  border-radius: -1px -1px -1px black; }
+  border-radius: -1px -1px -1px black;
+  grid-template-columns: [avatar] 2fr [body] 6fr; }
 
 #subtraction {
   lit: 10 -11;

tests/outputs_numbered/values.css

@@ -14,8 +14,9 @@ multiline block \
   margin: 4, 3, 1;
   content: "This is a \
 multiline string.";
-  border-radius: -1px -1px -1px black; }
-/* line 20, inputs/values.scss */
+  border-radius: -1px -1px -1px black;
+  grid-template-columns: [avatar] 2fr [body] 6fr; }
+/* line 21, inputs/values.scss */
 #subtraction {
   lit: 10 -11;
   lit: -1;
@@ -25,14 +26,14 @@ multiline string.";
   var: -90;
   var: -90;
   var: -90; }
-/* line 34, inputs/values.scss */
+/* line 35, inputs/values.scss */
 #special {
   a: 12px expression(1 + (3 / Foo.bar("baz" + "bang") + function() {return 12;}) % 12); }
-/* line 38, inputs/values.scss */
+/* line 39, inputs/values.scss */
 #unary {
   b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
-/* line 44, inputs/values.scss */
+/* line 45, inputs/values.scss */
 #self {
   content: "#self"; }