Nested mixin changing important 2421

lib/less/tree/mixin-definition.js

@@ -112,6 +112,17 @@ Definition.prototype.evalParams = function (context, mixinEnv, args, evaldArgume
 
  return frame;
 };
+Definition.prototype.makeImportant = function() {
+ var rules = !this.rules ? this.rules : this.rules.map(function (r) {
+ if (r.makeImportant) {
+ return r.makeImportant(true);
+ } else {
+ return r;
+ }
+ });
+ var result = new Definition (this.name, this.params, rules, this.condition, this.variadic, this.frames);
+ return result;
+};
 Definition.prototype.eval = function (context) {
  return new Definition(this.name, this.params, this.rules, this.condition, this.variadic, this.frames || context.frames.slice(0));
 };
@@ -129,7 +140,7 @@ Definition.prototype.evalCall = function (context, args, important) {
  ruleset.originalRuleset = this;
  ruleset = ruleset.eval(new contexts.Eval(context, [this, frame].concat(mixinFrames)));
  if (important) {
- ruleset = this.makeImportant.apply(ruleset);
+ ruleset = ruleset.makeImportant();
  }
  return ruleset;
 };

lib/less/tree/ruleset.js

@@ -183,15 +183,17 @@ Ruleset.prototype.evalImports = function(context) {
  }
 };
 Ruleset.prototype.makeImportant = function() {
- this.rules = this.rules.map(function (r) {
+ var result = new Ruleset(this.selectors, this.rules.map(function (r) {
  if (r.makeImportant) {
  return r.makeImportant();
  } else {
  return r;
  }
- });
- return this;
-};Ruleset.prototype.matchArgs = function (args) {
+ }), this.strictImports);
+
+ return result;
+};
+Ruleset.prototype.matchArgs = function (args) {
  return !args || args.length === 0;
 };
 // lets you call a css selector with a guard

test/css/mixins-important.css

@@ -49,3 +49,9 @@
 .when-calling-nested-with-param-issue-2394 {
  width: 10px !important;
 }
+.class1-2421 {
+ margin: 5px !important;
+}
+.class2-2421 {
+ margin: 5px;
+}

test/less/mixins-important.less

@@ -34,4 +34,20 @@
 }
 .when-calling-nested-with-param-issue-2394 {
  .size(10px) !important;
-}
+}
+.testMixin-2421 () {
+ .topCheck-2421 () {
+ .nestedCheck-2421() {
+ margin: 5px;
+ }
+ .nestedCheck-2421();
+ }
+ .topCheck-2421();
+}
+.class1-2421 {
+ .testMixin-2421() !important;
+}
+.class2-2421 {
+ .testMixin-2421();
+}
+