Merge branch 'master' of https://github.com/less/less.js

less · Mar 12, 2015 · 8000f62 · 8000f62
2 parents 1241284 + 5387ee5
commit 8000f62
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/lib/less/parser/parser.js b/lib/less/parser/parser.js
@@ -704,10 +704,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                                     expressionContainsNamed = true;
                                 }
 
-                                // we do not support setting a ruleset as a default variable - it doesn't make sense
-                                // However if we do want to add it, there is nothing blocking it, just don't error
-                                // and remove isCall dependency below
-                                value = (isCall && parsers.detachedRuleset()) || parsers.expression();
+                                value = parsers.detachedRuleset() || parsers.expression();
 
                                 if (!value) {
                                     if (isCall) {

diff --git a/test/css/detached-rulesets.css b/test/css/detached-rulesets.css
@@ -69,3 +69,8 @@ html.lt-ie9 header {
 .a {
   test: test;
 }
+.argument-default {
+  default: works;
+  direct: works;
+  named: works;
+}
diff --git a/test/less/detached-rulesets.less b/test/less/detached-rulesets.less
@@ -100,4 +100,13 @@ header {
 @my-mixins();
 .a {
   .mixin();
+}
+// as mixin argument default
+.mixin-definition(@a: {}; @b: {default: works;};) {
+  @a();
+  @b();
+}
+.argument-default {
+  .mixin-definition();
+  .mixin-definition({direct: works;}; @b: {named: works;});
 }
diff --git a/test/less/errors/detached-ruleset-4.less b/test/less/errors/detached-ruleset-4.less
diff --git a/test/less/errors/detached-ruleset-4.txt b/test/less/errors/detached-ruleset-4.txt