Merge branch 'feature/calc-fix' into edge

less · Feb 10, 2018 · c185461 · c185461
2 parents 327b5d5 + e2242b9
commit c185461
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 45 deletions.
diff --git a/dist/less.js b/dist/less.js
@@ -1003,7 +1003,11 @@ contexts.Eval.prototype.outOfParenthesis = function () {
     this.parensStack.pop();
 };
 
+contexts.Eval.prototype.mathOn = true;
 contexts.Eval.prototype.isMathOn = function () {
+    if (!this.mathOn) {
+        return false;
+    }
     return this.strictMath ? (this.parensStack && this.parensStack.length) : true;
 };
 
@@ -4019,6 +4023,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }
 
                     parserInput.forget();
+
                     return new(tree.Call)(name, args, index, fileInfo);
                 },
 
@@ -4194,7 +4199,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }
                 },
 
-                // A property entity useing the protective {} e.g. @{prop}
+                // A property entity useing the protective {} e.g. ${prop}
                 propertyCurly: function () {
                     var curly, index = parserInput.i;
 
@@ -6331,6 +6336,7 @@ var Node = require("./node"),
 var Call = function (name, args, index, currentFileInfo) {
     this.name = name;
     this.args = args;
+    this.mathOn = name === 'calc' ? false : true;
     this._index = index;
     this._fileInfo = currentFileInfo;
 };
@@ -6353,8 +6359,16 @@ Call.prototype.accept = function (visitor) {
 // The function should receive the value, not the variable.
 //
 Call.prototype.eval = function (context) {
-    var args = this.args.map(function (a) { return a.eval(context); }),
-        result, funcCaller = new FunctionCaller(this.name, context, this.getIndex(), this.fileInfo());
+
+    /**
+     * Turn off math for calc(), and switch back on for evaluating nested functions
+     */
+    var currentMathContext = context.mathOn;
+    context.mathOn = this.mathOn;
+    var args = this.args.map(function (a) { return a.eval(context); });
+    context.mathOn = currentMathContext;
+
+    var result, funcCaller = new FunctionCaller(this.name, context, this.getIndex(), this.fileInfo());
 
     if (funcCaller.isValid()) {
         try {
@@ -8384,7 +8398,6 @@ module.exports = Property;
 
 },{"./declaration":58,"./node":73}],77:[function(require,module,exports){
 var Node = require("./node"),
-    JsEvalNode = require("./js-eval-node"),
     Variable = require("./variable"),
     Property = require("./property");
 
@@ -8441,7 +8454,7 @@ Quoted.prototype.compare = function (other) {
 };
 module.exports = Quoted;
 
-},{"./js-eval-node":67,"./node":73,"./property":76,"./variable":85}],78:[function(require,module,exports){
+},{"./node":73,"./property":76,"./variable":85}],78:[function(require,module,exports){
 var Node = require("./node"),
     Declaration = require("./declaration"),
     Keyword = require("./keyword"),

diff --git a/dist/less.min.js b/dist/less.min.js
diff --git a/lib/less/contexts.js b/lib/less/contexts.js
@@ -73,7 +73,11 @@ contexts.Eval.prototype.outOfParenthesis = function () {
     this.parensStack.pop();
 };
 
+contexts.Eval.prototype.mathOn = true;
 contexts.Eval.prototype.isMathOn = function () {
+    if (!this.mathOn) {
+        return false;
+    }
     return this.strictMath ? (this.parensStack && this.parensStack.length) : true;
 };
 

diff --git a/lib/less/parser/parser.js b/lib/less/parser/parser.js
@@ -421,6 +421,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }
 
                     parserInput.forget();
+
                     return new(tree.Call)(name, args, index, fileInfo);
                 },
 
@@ -596,7 +597,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }
                 },
 
-                // A property entity useing the protective {} e.g. @{prop}
+                // A property entity useing the protective {} e.g. ${prop}
                 propertyCurly: function () {
                     var curly, index = parserInput.i;
 

diff --git a/lib/less/tree/call.js b/lib/less/tree/call.js
@@ -7,6 +7,7 @@ var Node = require("./node"),
 var Call = function (name, args, index, currentFileInfo) {
     this.name = name;
     this.args = args;
+    this.mathOn = name === 'calc' ? false : true;
     this._index = index;
     this._fileInfo = currentFileInfo;
 };
@@ -29,8 +30,16 @@ Call.prototype.accept = function (visitor) {
 // The function should receive the value, not the variable.
 //
 Call.prototype.eval = function (context) {
-    var args = this.args.map(function (a) { return a.eval(context); }),
-        result, funcCaller = new FunctionCaller(this.name, context, this.getIndex(), this.fileInfo());
+
+    /**
+     * Turn off math for calc(), and switch back on for evaluating nested functions
+     */
+    var currentMathContext = context.mathOn;
+    context.mathOn = this.mathOn;
+    var args = this.args.map(function (a) { return a.eval(context); });
+    context.mathOn = currentMathContext;
+
+    var result, funcCaller = new FunctionCaller(this.name, context, this.getIndex(), this.fileInfo());
 
     if (funcCaller.isValid()) {
         try {

diff --git a/lib/less/tree/directive.js b/lib/less/tree/directive.js
diff --git a/lib/less/tree/quoted.js b/lib/less/tree/quoted.js
@@ -1,5 +1,4 @@
 var Node = require("./node"),
-    JsEvalNode = require("./js-eval-node"),
     Variable = require("./variable"),
     Property = require("./property");
 

diff --git a/lib/less/tree/rule.js b/lib/less/tree/rule.js
diff --git a/test/browser/runner-browser-options.js b/test/browser/runner-browser-options.js
@@ -2,7 +2,7 @@ var less = {
     logLevel: 4, 
     errorReporting: "console", 
     javascriptEnabled: true,
-    strictMath: true
+    strictMath: false
 };
 
 // There originally run inside describe method. However, since they have not

diff --git a/test/browser/runner-main-options.js b/test/browser/runner-main-options.js
@@ -2,7 +2,6 @@ var less = {
     logLevel: 4,
     errorReporting: "console"
 };
-less.strictMath = true;
 less.functions = {
     add: function(a, b) {
         return new(less.tree.Dimension)(a.value + b.value);

diff --git a/test/css/calc.css b/test/css/calc.css
@@ -0,0 +1,5 @@
+.no-math {
+  width: calc(50% + (25vh - 20px));
+  foo: 3 calc(3 + 4) 11;
+  bar: calc(1 + 20%);
+}
diff --git a/test/css/comments2.css b/test/css/comments2.css
@@ -8,7 +8,7 @@
 .first,
 .planning {
   margin: 10px;
-  total-width: (1 * 6em * 12) + (2em * 12);
+  total-width: 96em;
 }
 .some-inline-comments {
   a: yes /* comment */;

diff --git a/test/css/css.css → test/css/strict-math/css.css b/test/css/css.css → test/css/strict-math/css.css
diff --git a/test/css/mixins-args.css → test/css/strict-math/mixins-args.css b/test/css/mixins-args.css → test/css/strict-math/mixins-args.css
diff --git a/test/css/parens.css → test/css/strict-math/parens.css b/test/css/parens.css → test/css/strict-math/parens.css
diff --git a/test/index.js b/test/index.js
@@ -8,13 +8,17 @@ console.log("\n" + stylize("Less", 'underline') + "\n");
 lessTester.prepBomTest();
 var testMap = [
     [{
-        strictMath: true, 
+        strictMath: false, 
         relativeUrls: true, 
         silent: true, 
         javascriptEnabled: true,
         // Set explicitly for legacy tests for >3.0
         ieCompat: true
     }],
+    [{
+        strictMath: true,
+        ieCompat: true
+    }, "strict-math/"],
     [{strictMath: true, strictUnits: true, javascriptEnabled: true}, "errors/",
         lessTester.testErrors, null],
     [{strictMath: true, strictUnits: true, javascriptEnabled: false}, "no-js-errors/",
@@ -56,7 +60,7 @@ testMap.forEach(function(args) {
     lessTester.runTestSet.apply(lessTester, args)
 });
 lessTester.testSyncronous({syncImport: true}, "import");
-lessTester.testSyncronous({syncImport: true}, "css");
+lessTester.testSyncronous({syncImport: true}, "strict-math/css");
 lessTester.testNoOptions();
 lessTester.testJSImport();
 lessTester.finished();
diff --git a/test/less/calc.less b/test/less/calc.less
@@ -0,0 +1,7 @@
+.no-math {
+  @var: 50vh/2;
+  width: calc(50% + (@var - 20px));
+  foo: 1 + 2 calc(3 + 4) 5 + 6;
+  @floor: floor(1 + .1);
+  bar: calc(@floor + 20%);
+}
diff --git a/test/less/media.less b/test/less/media.less
@@ -23,7 +23,7 @@
 @ratio_large: 16;
 @ratio_small: 9;
 
-@media all and (device-aspect-ratio: @ratio_large / @ratio_small) {
+@media all and (device-aspect-ratio: ~"@{ratio_large} / @{ratio_small}") {
    body { max-width: 800px; }
 }
 
@@ -177,7 +177,7 @@ body {
   }
 }
 
-@media (-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: 2/1), (min-resolution: 2dppx), (min-resolution: 128dpcm) {
+@media (-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: ~"2/1"), (min-resolution: 2dppx), (min-resolution: 128dpcm) {
   .b {
     background: red;
   }

diff --git a/test/less/css.less → test/less/strict-math/css.less b/test/less/css.less → test/less/strict-math/css.less
diff --git a/test/less/mixins-args.less → test/less/strict-math/mixins-args.less b/test/less/mixins-args.less → test/less/strict-math/mixins-args.less
diff --git a/test/less/parens.less → test/less/strict-math/parens.less b/test/less/parens.less → test/less/strict-math/parens.less