Tests and parser fixes for namespace values in MQ and mixin args (#3254)

less · Jul 3, 2018 · 39ef69c · 39ef69c
1 parent 29468bf
commit 39ef69c
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 3 deletions.
diff --git a/lib/less/parser/parser.js b/lib/less/parser/parser.js
@@ -950,7 +950,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                                     .push({ variadic: true });
                                 break;
                             }
-                            arg = entities.variable() || entities.property() || entities.literal() || entities.keyword();
+                            arg = entities.variable() || entities.property() || entities.literal() || entities.keyword() || this.call(true);
                         }
 
                         if (!arg) {
@@ -1642,7 +1642,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 var entities = this.entities, nodes = [], e, p;
                 parserInput.save();
                 do {
-                    e = entities.keyword() || entities.variable();
+                    e = entities.keyword() || entities.variable() || entities.mixinLookup();
                     if (e) {
                         nodes.push(e);
                     } else if (parserInput.$char('(')) {
@@ -1676,7 +1676,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                         features.push(e);
                         if (!parserInput.$char(',')) { break; }
                     } else {
-                        e = entities.variable();
+                        e = entities.variable() || entities.mixinLookup();
                         if (e) {
                             features.push(e);
                             if (!parserInput.$char(',')) { break; }

diff --git a/test/css/edge/namespacing-2.css b/test/css/edge/namespacing-2.css
@@ -5,3 +5,6 @@
 .foo {
   width: 800px;
 }
+.lunch {
+  treat: ice cream;
+}
diff --git a/test/css/edge/namespacing-media.css b/test/css/edge/namespacing-media.css
@@ -0,0 +1,5 @@
+@media not all and (min-width: 480px) {
+  .selector {
+    prop: val;
+  }
+}
diff --git a/test/less/edge/namespacing-2.less b/test/less/edge/namespacing-2.less
@@ -14,4 +14,14 @@
 
 .foo {
   width: #library.sizes[@width];
+}
+
+.foods() {
+  @dessert: ice cream;
+}
+
+@key-to-lookup: dessert;
+
+.lunch {
+  treat: .foods[@@key-to-lookup];
 }
diff --git a/test/less/edge/namespacing-media.less b/test/less/edge/namespacing-media.less
@@ -0,0 +1,26 @@
+#ns {
+  .sizes() {
+    @small: 600px;
+  }
+  .breakpoint(@size) {
+    @val: #ns.sizes[@@size];
+    @min: (min-width: @val);
+    @max: not all and @min;
+  }
+}
+
+#ns {
+  .sizes() {
+    @small: 480px;
+  }
+}
+
+.valToGet() {
+  keyword: small;
+}
+
+@media #ns.breakpoint(.valToGet[keyword])[@max] {
+  .selector {
+    prop: val;
+  }
+}