less 3.6.0 → 3.8.1

package/test/less-bom/math/strict/css.less

@@ -0,0 +1,108 @@
+@charset "utf-8";
+div { color: black; }
+div { width: 99%; }
+
+* {
+  min-width: 45em;
+}
+
+h1, h2 > a > p, h3 {
+  color: none;
+}
+
+div.class {
+  color: blue;
+}
+
+div#id {
+  color: green;
+}
+
+.class#id {
+  color: purple;
+}
+
+.one.two.three {
+  color: grey;
+}
+
+@media print {
+  * {
+    font-size: 3em;
+  }
+}
+
+@media screen {
+  * {
+    font-size: 10px;
+  }
+}
+
+@font-face {
+  font-family: 'Garamond Pro';
+}
+
+a:hover, a:link {
+  color: #999;
+}
+
+p, p:first-child {
+  text-transform: none;
+}
+
+q:lang(no) {
+  quotes: none;
+}
+
+p + h1 {
+  font-size: +2.2em;
+}
+
+#shorthands {
+  border: 1px solid #000;
+  font: 12px/16px Arial;
+  font: 100%/16px Arial;
+  margin: 1px 0;
+  padding: 0 auto;
+}
+
+#more-shorthands {
+  margin: 0;
+  padding: 1px 0 2px 0;
+  font: normal small/20px 'Trebuchet MS', Verdana, sans-serif;
+  font: 0/0 a;
+  border-radius: 5px / 10px;
+}
+
+.misc {
+  -moz-border-radius: 2px;
+  display: -moz-inline-stack;
+  width: .1em;
+  background-color: #009998;
+  background: -webkit-gradient(linear, left top, left bottom, from(red), to(blue));
+  margin: ;
+  .nested-multiple {
+    multiple-semi-colons: yes;;;;;;
+  };
+  filter: alpha(opacity=100);
+  width: auto\9;
+}
+
+#important {
+  color: red !important;
+  width: 100%!important;
+  height: 20px ! important;
+}
+
+.def-font(@name) {
+    @font-face {
+        font-family: @name
+    }
+}
+
+.def-font(font-a);
+.def-font(font-b);
+
+.æøå {
+  margin: 0;
+}

package/test/less-bom/math/strict/media-math.less

@@ -0,0 +1,9 @@
+@var: 16;
+
+@media (min-width: @var + 1) {
+  .foo { bar: 1; }
+}
+
+@media (min-width: @var / 9) {
+  .foo { bar: 1; }
+}

package/test/less-bom/math/strict/mixins-args.less

@@ -0,0 +1,264 @@
+.mixin (@a: 1px, @b: 50%) {
+  width: (@a * 5);
+  height: (@b - 1%);
+  depth: @b - 1%;
+}
+
+.mixina (@style, @width, @color: black) {
+    border: @width @style @color;
+}
+
+.mixiny
+(@a: 0, @b: 0) {
+  margin: @a;
+  padding: @b;
+}
+
+.hidden() {
+  color: transparent; // asd
+}
+
+#hidden {
+  .hidden;
+}
+
+#hidden1 {
+  .hidden();
+}
+
+.two-args {
+  color: blue;
+  .mixin(2px, 100%);
+  .mixina(dotted, 2px);
+}
+
+.one-arg {
+  .mixin(3px);
+}
+
+.no-parens {
+  .mixin;
+}
+
+.no-args {
+  .mixin();
+}
+
+.var-args {
+  @var: 9;
+  .mixin(@var, (@var * 2) / 2);
+}
+
+.multi-mix {
+  .mixin(2px, 30%);
+  .mixiny(4, 5);
+}
+
+.maxa(@arg1: 10, @arg2: #f00) {
+  padding: (@arg1 * 2px);
+  color: @arg2;
+}
+
+body {
+  .maxa(15);
+}
+
+@glob: 5;
+.global-mixin(@a:2) {
+  width: (@glob + @a);
+}
+
+.scope-mix {
+  .global-mixin(3);
+}
+
+.nested-ruleset (@width: 200px) {
+    width: @width;
+    .column { margin: @width; }
+}
+.content {
+    .nested-ruleset(600px);
+}
+
+//
+
+.same-var-name2(@radius) {
+  radius: @radius;
+}
+.same-var-name(@radius) {
+  .same-var-name2(@radius);
+}
+#same-var-name {
+  .same-var-name(5px);
+}
+
+//
+
+.var-inside () {
+    @var: 10px;
+    width: @var;
+}
+#var-inside { .var-inside; }
+
+.mixin-arguments (@width: 0px, ...) {
+    border: @arguments;
+    width: @width;
+}
+
+.arguments {
+    .mixin-arguments(1px, solid, black);
+}
+.arguments2 {
+    .mixin-arguments();
+}
+.arguments3 {
+    .mixin-arguments;
+}
+
+.mixin-arguments2 (@width, @rest...) {
+    border: @arguments;
+    rest: @rest;
+    width: @width;
+}
+.arguments4 {
+    .mixin-arguments2(0, 1, 2, 3, 4);
+}
+
+// Edge cases
+
+.edge-case {
+    .mixin-arguments("{");
+}
+
+// Division vs. Literal Slash
+.border-radius(@r: 2px/5px) {
+  border-radius: @r;
+}
+.slash-vs-math {
+  .border-radius();
+  .border-radius(5px/10px);
+  .border-radius((3px * 2));
+}
+// semi-colon vs comma for delimiting
+
+.mixin-takes-one(@a) {
+    one: @a;
+}
+
+.mixin-takes-two(@a; @b) {
+    one: @a;
+    two: @b;
+}
+
+.comma-vs-semi-colon {
+    .mixin-takes-two(@a : a; @b : b, c);
+    .mixin-takes-two(@a : d, e; @b : f);
+    .mixin-takes-one(@a: g);
+    .mixin-takes-one(@a : h;);
+    .mixin-takes-one(i);
+    .mixin-takes-one(j;);
+    .mixin-takes-two(k, l);
+    .mixin-takes-one(m, n;);
+    .mixin-takes-two(o, p; q);
+    .mixin-takes-two(r, s; t;);
+}
+
+.mixin-conflict(@a:defA, @b:defB, @c:defC) {
+  three: @a, @b, @c;
+}
+
+.mixin-conflict(@a:defA, @b:defB, @c:defC, @d:defD) {
+  four: @a, @b, @c, @d;
+}
+
+#named-conflict {
+  .mixin-conflict(11, 12, 13, @a:a);
+  .mixin-conflict(@a:a, 21, 22, 23);
+}
+@a: 3px;
+.mixin-default-arg(@a: 1px, @b: @a, @c: @b) {
+  defaults: 1px 1px 1px;
+  defaults: 2px 2px 2px;
+}
+
+.test-mixin-default-arg {
+  .mixin-default-arg();
+  .mixin-default-arg(2px);
+}
+
+.mixin-comma-default1(@color; @padding; @margin: 2, 2, 2, 2) {
+  margin: @margin;
+}
+.selector {
+  .mixin-comma-default1(#33acfe; 4);
+}
+.mixin-comma-default2(@margin: 2, 2, 2, 2;) {
+  margin: @margin;
+}
+.selector2 {
+  .mixin-comma-default2();
+}
+.mixin-comma-default3(@margin: 2, 2, 2, 2) {
+  margin: @margin;
+}
+.selector3 {
+  .mixin-comma-default3(4,2,2,2);
+}
+
+.test-calling-one-arg-mixin(@a) {
+}
+
+.test-calling-one-arg-mixin(@a, @b, @rest...) {
+}
+
+div {
+  .test-calling-one-arg-mixin(1);
+}
+
+mixins-args-expand-op- {
+  @x: 1, 2, 3;
+  @y: 4  5  6;
+
+  &1 {.m3(@x...)}
+  &2 {.m3(@y...)}
+  &3 {.wr(a, b, c)}
+  &4 {.wr(a; b; c, d)}
+  &5 {.wr(@x...)}
+  &6 {.m4(0; @x...)}
+  &7 {.m4(@x..., @a: 0)}
+  &8 {.m4(@b: 1.5; @x...)}
+  &9 {.aa(@y, @x..., and again, @y...)}
+
+  .m3(@a, @b, @c) {
+    m3: @a, @b, @c;
+  }
+
+  .m4(@a, @b, @c, @d) {
+    m4: @a, @b, @c, @d;
+  }
+
+  .wr(@a...) {
+    &a {.m3(@a...)}
+    &b {.m4(0, @a...)}
+    &c {.m4(@a..., 4)}
+  }
+
+  .aa(@a...) {
+    aa: @a;
+    a4: extract(@a, 5);
+    a8: extract(@a, 8);
+  }
+}
+#test-mixin-matching-when-default-2645 {
+  .mixin(@height) {
+    height: @height;
+  }
+
+  .mixin(@width, @height: 10px) {
+    width: @width;
+
+    .mixin(@height: @height);
+  }
+
+  .mixin(@height: 20px);
+}

package/test/less-bom/math/strict/parens.less

@@ -0,0 +1,46 @@
+.parens {
+  @var: 1px;
+  border: (@var * 2) solid black;
+  margin: (@var * 1) (@var + 2) (4 * 4) 3;
+  width: (6 * 6);
+  padding: 2px (6 * 6px);
+}
+
+.more-parens {
+  @var: (2 * 2);
+  padding: (2 * @var) 4 4 (@var * 1px);
+  width-all: ((@var * @var) * 6);
+  width-first: ((@var * @var)) * 6;
+  width-keep: (@var * @var) * 6;
+  height: calc(100% + (25vh - 20px));
+  height-keep: (7 * 7) + (8 * 8);
+  height-all: ((7 * 7) + (8 * 8));
+  height-parts: ((7 * 7)) + ((8 * 8));
+  margin-keep: (4 * (5 + 5) / 2) - (@var * 2);
+  margin-parts: ((4 * (5 + 5) / 2)) - ((@var * 2));
+  margin-all: ((4 * (5 + 5) / 2) + (-(@var * 2)));
+  border-radius-keep: 4px * (1 + 1) / @var + 3px;
+  border-radius-parts: ((4px * (1 + 1))) / ((@var + 3px));
+  border-radius-all: (4px * (1 + 1) / @var + 3px);
+  // margin: (6 * 6)px;
+}
+
+.negative {
+  @var: 1;
+  neg-var: -@var; // -1 ?
+  neg-var-paren: -(@var); // -(1) ?
+}
+
+.nested-parens {
+  width: 2 * (4 * (2 + (1 + 6))) - 1;
+  height: ((2 + 3) * (2 + 3) / (9 - 4)) + 1;
+}
+
+.mixed-units {
+  margin: 2px 4em 1 5pc;
+  padding: (2px + 4px) 1em 2px 2;
+}
+
+.test-false-negatives {
+  a: ~"(";
+}

package/test/less-bom/math/strict-legacy/media-math.less

@@ -0,0 +1,9 @@
+@var: 16;
+
+@media (min-width: @var + 1) {
+  .foo { bar: 1; }
+}
+
+@media (min-width: @var / 9) {
+  .foo { bar: 1; }
+}

package/test/less-bom/math/strict-legacy/parens.less

@@ -0,0 +1,50 @@
+.parens {
+  @var: 1px;
+  border: (@var * 2) solid black;
+  margin: (@var * 1) (@var + 2) (4 * 4) 3;
+  width: (6 * 6);
+  padding: 2px (6 * 6px);
+}
+
+.in-function {
+  value: min((1 + 1)) + 1;
+}
+
+.more-parens {
+  @var: (2 * 2);
+  padding: (2 * @var) 4 4 (@var * 1px);
+  width-all: ((@var * @var) * 6);
+  width-first: ((@var * @var)) * 6;
+  width-keep: (@var * @var) * 6;
+  height: calc(100% + (25vh - 20px));
+  height-keep: (7 * 7) + (8 * 8);
+  height-all: ((7 * 7) + (8 * 8));
+  height-parts: ((7 * 7)) + ((8 * 8));
+  margin-keep: (4 * (5 + 5) / 2) - (@var * 2);
+  margin-parts: ((4 * (5 + 5) / 2)) - ((@var * 2));
+  margin-all: ((4 * (5 + 5) / 2) + (-(@var * 2)));
+  border-radius-keep: 4px * (1 + 1) / @var + 3px;
+  border-radius-parts: ((4px * (1 + 1))) / ((@var + 3px));
+  border-radius-all: (4px * (1 + 1) / @var + 3px);
+  // margin: (6 * 6)px;
+}
+
+.negative {
+  @var: 1;
+  neg-var: -@var; // -1 ?
+  neg-var-paren: -(@var); // -(1) ?
+}
+
+.nested-parens {
+  width: 2 * (4 * (2 + (1 + 6))) - 1;
+  height: ((2 + 3) * (2 + 3) / (9 - 4)) + 1;
+}
+
+.mixed-units {
+  margin: 2px 4em 1 5pc;
+  padding: (2px + 4px) 1em 2px 2;
+}
+
+.test-false-negatives {
+  a: ~"(";
+}

package/test/less-bom/no-strict-math/no-sm-operations.less

@@ -11,3 +11,6 @@
     color: green-black;
     animation: blue-change 5s infinite;
 }
+.division {
+    value: ((16px ./ 2) / 2) / 2;
+}

package/test/less-bom/rewrite-urls-all/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rewrite-urls-all/rewrite-urls-all.less

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rewrite-urls-all {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rewrite-urls-local/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rewrite-urls-local/rewrite-urls-local.less

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rewrite-urls-local {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rootpath-rewrite-urls-all/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rootpath-rewrite-urls-all/rootpath-rewrite-urls-all.less

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rootpath-rewrite-urls-all {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rootpath-rewrite-urls-local/folder/file.less

@@ -0,0 +1,8 @@
+#imported-file {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("../../relative/path");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/rootpath-rewrite-urls-local/rootpath-rewrite-urls-local.less

@@ -0,0 +1,11 @@
+@import "./folder/file.less";
+
+#rootpath-rewrite-urls-local {
+  background-image: url("./relative/path");
+  background-image: url("../relative/path");
+  background-image: url("./relative/../path");
+  background-image: url("./relative/../path/..");
+  background-image: url("module");
+  background-image: url("module/path");
+  background-image: url("module/path/../relative/path");
+}

package/test/less-bom/sourcemaps/custom-props.less

@@ -0,0 +1,8 @@
+@color: var(--foo);
+
+body {
+	border-left: 1px solid @color;
+	width: calc(50% - 5px);
+	border-top: 1px solid @color;
+}
+

package/test/less-test.js

@@ -4,7 +4,8 @@ module.exports = function() {
     var path = require('path'),
         fs = require('fs'),
         copyBom = require('./copy-bom')(),
-        doBomTest = false;
+        doBomTest = false,
+        clone = require('clone');
 
     var less = require('../lib/less-node');
     var stylize = require('../lib/less-node/lessc-helper').stylize;
@@ -82,6 +83,10 @@ module.exports = function() {
     });
 
     function testSourcemap(name, err, compiledLess, doReplacements, sourcemap, baseFolder) {
+        if (err) {
+            fail('ERROR: ' + (err && err.message));
+            return;
+        }
         // Check the sourceMappingURL at the bottom of the file
         var expectedSourceMapURL = name + '.css.map',
             sourceMappingPrefix = '/*# sourceMappingURL=',
@@ -226,10 +231,10 @@ module.exports = function() {
     }
 
     function runTestSet(options, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
-        var options2 = options ? JSON.parse(JSON.stringify(options)) : {};
+        options = options ? clone(options) : {};
         runTestSetInternal(normalFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
         if (doBomTest) {
-            runTestSetInternal(bomFolder, options2, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
+            runTestSetInternal(bomFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
         }
     }
 
@@ -237,8 +242,10 @@ module.exports = function() {
         runTestSetInternal(normalFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
     }
 
-    function runTestSetInternal(baseFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
+    function runTestSetInternal(baseFolder, opts, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
         foldername = foldername || '';
+        
+        var originalOptions = opts || {};
 
         if (!doReplacements) {
             doReplacements = globalReplacements;
@@ -251,6 +258,8 @@ module.exports = function() {
         fs.readdirSync(path.join(baseFolder, foldername)).forEach(function (file) {
             if (!/\.less$/.test(file)) { return; }
 
+            var options = clone(originalOptions);
+
             var name = getBasename(file);
 
             if (oneTestOnly && name !== oneTestOnly) {
@@ -260,20 +269,24 @@ module.exports = function() {
             totalTests++;
 
             if (options.sourceMap && !options.sourceMap.sourceMapFileInline) {
-                options.sourceMapOutputFilename = name + '.css';
-                options.sourceMapBasepath = path.join(process.cwd(), baseFolder);
-                options.sourceMapRootpath = 'testweb/';
-                // TODO separate options?
-                options.sourceMap = options;
-
+                options.sourceMap = {
+                    sourceMapOutputFilename: name + '.css',
+                    sourceMapBasepath: path.join(process.cwd(), baseFolder),
+                    sourceMapRootpath: 'testweb/'
+                };
                 // This options is normally set by the bin/lessc script. Setting it causes the sourceMappingURL comment to be appended to the CSS
                 // output. The value is designed to allow the sourceMapBasepath option to be tested, as it should be removed by less before
                 // setting the sourceMappingURL value, leaving just the sourceMapOutputFilename and .map extension.
-                options.sourceMapFilename = options.sourceMapBasepath + '/' + options.sourceMapOutputFilename + '.map';
+                options.sourceMap.sourceMapFilename = options.sourceMap.sourceMapBasepath + '/' + options.sourceMap.sourceMapOutputFilename + '.map';
             }
 
             options.getVars = function(file) {
-                return JSON.parse(fs.readFileSync(getFilename(getBasename(file), 'vars', baseFolder), 'utf8'));
+                try {
+                    return JSON.parse(fs.readFileSync(getFilename(getBasename(file), 'vars', baseFolder), 'utf8'));
+                }
+                catch (e) {
+                    return {};
+                }
             };
 
             var doubleCallCheck = false;
@@ -294,6 +307,7 @@ module.exports = function() {
                         release();
                         return verificationResult;
                     }
+
                     if (err) {
                         fail('ERROR: ' + (err && err.message));
                         if (isVerbose) {

package/test/sourcemaps/custom-props.json

@@ -0,0 +1 @@
+{"version":3,"sources":["testweb/sourcemaps/custom-props.less"],"names":[],"mappings":"AAEA;EACC,uBAHO,UAGP;EACA,OAAO,eAAP;EACA,gCAAA","file":"sourcemaps/custom-props.css"}