Fixes #3430: Removed unnecessary 'important' from NamespaceValue. (#3431

)
less · May 5, 2020 · 9217936 · 9217936
1 parent 971eb20
commit 9217936
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 10 deletions.
diff --git a/lib/less/parser/parser.js b/lib/less/parser/parser.js
@@ -744,7 +744,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             //     color: @fink[@color];
             //
             variableCall: function (parsedName) {
-                var lookups, important, i = parserInput.i,
+                var lookups, i = parserInput.i,
                     inValue = !!parsedName, name = parsedName;
 
                 parserInput.save();
@@ -763,18 +763,14 @@ var Parser = function Parser(context, imports, fileInfo) {
                         name = name[1];
                     }
 
-                    if (lookups && parsers.important()) {
-                        important = true;
-                    }
-
                     var call = new tree.VariableCall(name, i, fileInfo);
                     if (!inValue && parsers.end()) {
                         parserInput.forget();
                         return call;
                     }
                     else {
                         parserInput.forget();
-                        return new tree.NamespaceValue(call, lookups, important, i, fileInfo);
+                        return new tree.NamespaceValue(call, lookups, i, fileInfo);
                     }
                 }
 
@@ -893,7 +889,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                             parserInput.forget();
                             var mixin = new(tree.mixin.Call)(elements, args, index, fileInfo, !lookups && important);
                             if (lookups) {
-                                return new tree.NamespaceValue(mixin, lookups, important);
+                                return new tree.NamespaceValue(mixin, lookups);
                             }
                             else {
                                 return mixin;

diff --git a/lib/less/tree/namespace-value.js b/lib/less/tree/namespace-value.js
@@ -3,10 +3,9 @@ var Node = require('./node'),
     Ruleset = require('./ruleset'),
     Selector = require('./selector');
 
-var NamespaceValue = function (ruleCall, lookups, important, index, fileInfo) {
+var NamespaceValue = function (ruleCall, lookups, index, fileInfo) {
     this.value = ruleCall;
     this.lookups = lookups;
-    this.important = important;
     this._index = index;
     this._fileInfo = fileInfo;
 };

diff --git a/test/css/namespacing/namespacing-3.css b/test/css/namespacing/namespacing-3.css
@@ -6,3 +6,18 @@
     color: white;
   }
 }
+.cell {
+  margin: 0 5px !important;
+}
+.class1 {
+  color: #33acfe !important;
+  margin: 20px !important;
+  padding: 20px !important;
+  width: 0 !important;
+}
+.class2 {
+  color: #efca44;
+  margin: 10px;
+  padding: 40px 10px;
+  width: 0 !important;
+}
diff --git a/test/less/namespacing/namespacing-3.less b/test/less/namespacing/namespacing-3.less
@@ -25,4 +25,27 @@
     background: @map[@colors][toolbar-background];
     color: @map[@colors][toolbar-foreground];
   }
-}
+}
+
+// !important after map usage
+// https://github.com/less/less.js/issues/3430
+@margins: {
+    zero: 0;
+    ten: 10px;
+}
+.cell {
+  margin: @margins[zero] @margins[ten]/2 !important;
+}
+
+.mixin(@color: black; @margin: 10px; @padding: 20px) {
+  color: @color;
+  margin: @margin;
+  padding: @padding;
+  width: @margins[zero] !important
+}
+.class1 {
+  .mixin(@margin: 20px; @color: #33acfe) !important;
+}
+.class2 {
+  .mixin(#efca44; @padding: 40px 10px);
+}