less 2.3.3 → 2.4.0

data/lib/less/js/test/css/functions.css

@@ -13,6 +13,7 @@
   saturate: #203c31;
   desaturate: #29332f;
   greyscale: #2e2e2e;
+  hsl-clamp: #ffffff;
   spin-p: #bf6a40;
   spin-n: #bf4055;
   luma-white: 100%;
@@ -34,10 +35,15 @@
   contrast-cyan: #000000;
   contrast-light: #111111;
   contrast-dark: #eeeeee;
+  contrast-wrongorder: #111111;
   contrast-light-thresh: #111111;
   contrast-dark-thresh: #eeeeee;
   contrast-high-thresh: #eeeeee;
   contrast-low-thresh: #111111;
+  contrast-light-thresh-per: #111111;
+  contrast-dark-thresh-per: #eeeeee;
+  contrast-high-thresh-per: #eeeeee;
+  contrast-low-thresh-per: #111111;
   format: "rgb(32, 128, 64)";
   format-string: "hello world";
   format-multiple: "hello earth 2";
@@ -48,6 +54,9 @@
   hue: 98;
   saturation: 12%;
   lightness: 95%;
+  hsvhue: 98;
+  hsvsaturation: 12%;
+  hsvvalue: 95%;
   red: 255;
   green: 255;
   blue: 255;
@@ -58,6 +67,19 @@
   rounded-percentage: 10%;
   ceil: 11px;
   floor: 12px;
+  sqrt: 5px;
+  pi: 3.141592653589793;
+  mod: 2m;
+  abs: 4%;
+  tan: 0.9004040442978399;
+  sin: 0.17364817766693033;
+  cos: 0.8438539587324921;
+  atan: 0.1rad;
+  atan: 34.00000000000001deg;
+  atan: 45.00000000000001deg;
+  pow: 64px;
+  pow: 64;
+  pow: 27;
   percentage: 20%;
   color: #ff0011;
   tint: #898989;
@@ -66,6 +88,8 @@
   shade: #686868;
   shade-full: #000000;
   shade-percent: #686868;
+  fade-out: rgba(255, 0, 0, 0.95);
+  fade-in: rgba(255, 0, 0, 0.9500000000000001);
   hsv: #4d2926;
   hsva: rgba(77, 40, 38, 0.2);
   mix: #ff3300;
@@ -83,6 +107,7 @@
   pixel: true;
   percent: true;
   em: true;
+  cat: true;
 }
 #alpha {
   alpha: rgba(153, 94, 51, 0.6);
@@ -98,3 +123,6 @@
   average: #7b007b;
   negation: #d73131;
 }
+#extract {
+  result: 3 2 1 C B A;
+}

data/lib/less/js/test/css/import-interpolation.css

@@ -0,0 +1,6 @@
+body {
+  width: 100%;
+}
+.a {
+  var: test;
+}

data/lib/less/js/test/css/import.css

@@ -1,6 +1,8 @@
 @import url(http://fonts.googleapis.com/css?family=Open+Sans);
 
-@import url(something.css) screen and (color) and (max-width: 600px);
+@import url(/absolute/something.css) screen and (color) and (max-width: 600px);
+
+@import url("//ha.com/file.css") (min-width: 100px);
 #import-test {
   height: 10px;
   color: #ff0000;
@@ -19,3 +21,18 @@
   height: 10px;
   color: #ff0000;
 }
+@media screen and (max-width: 601px) {
+  #css {
+    color: yellow;
+  }
+}
+@media screen and (max-width: 602px) {
+  body {
+    width: 100%;
+  }
+}
+@media screen and (max-width: 603px) {
+  #css {
+    color: yellow;
+  }
+}

data/lib/less/js/test/css/legacy/legacy.css

@@ -0,0 +1,7 @@
+@media (-o-min-device-pixel-ratio: 2/1) {
+  .test-math-and-units {
+    font: ignores 0/0 rules;
+    test-division: 7em;
+    simple: 2px;
+  }
+}

data/lib/less/js/test/css/media.css

@@ -15,7 +15,7 @@
     max-width: 480;
   }
 }
-@media all and (device-aspect-ratio: 16/9) {
+@media all and (device-aspect-ratio: 16 / 9) {
   body {
     max-width: 800px;
   }
@@ -193,3 +193,11 @@ body {
     background: green;
   }
 }
+@media (max-width: 1200px) {
+  /* a comment */
+}
+@media (max-width: 1200px) and (max-width: 900px) {
+  body {
+    font-size: 11px;
+  }
+}

data/lib/less/js/test/css/mixins-args.css

@@ -72,6 +72,11 @@ body {
   border: "{";
   width: "{";
 }
+.slash-vs-math {
+  border-radius: 2px/5px;
+  border-radius: 5px/10px;
+  border-radius: 6px;
+}
 .comma-vs-semi-colon {
   one: a;
   two: b, c;
@@ -93,3 +98,16 @@ body {
   four: a, 11, 12, 13;
   four: a, 21, 22, 23;
 }
+.test-mixin-default-arg {
+  defaults: 1px 1px 1px;
+  defaults: 2px 2px 2px;
+}
+.selector {
+  margin: 2, 2, 2, 2;
+}
+.selector2 {
+  margin: 2, 2, 2, 2;
+}
+.selector3 {
+  margin: 4;
+}

data/lib/less/js/test/css/mixins-guards.css

@@ -69,3 +69,8 @@
   content: is not theme2;
   content: is theme1 no quotes;
 }
+#tryNumberPx {
+  catch: all;
+  declare: 4;
+  declare: 4px;
+}

data/lib/less/js/test/css/parens.css

@@ -6,13 +6,26 @@
 }
 .more-parens {
   padding: 8 4 4 4px;
-  width: 96;
-  height: 113;
-  margin: 12;
+  width-all: 96;
+  width-first: 16 * 6;
+  width-keep: (4 * 4) * 6;
+  height-keep: (7 * 7) + (8 * 8);
+  height-all: 113;
+  height-parts: 49 + 64;
+  margin-keep: (4 * (5 + 5) / 2) - (4 * 2);
+  margin-parts: 20 - 8;
+  margin-all: 12;
+  border-radius-keep: 4px * (1 + 1) / 4 + 3px;
+  border-radius-parts: 8px / 7px;
+  border-radius-all: 5px;
+}
+.negative {
+  neg-var: -1;
+  neg-var-paren: -(1);
 }
 .nested-parens {
-  width: 71;
-  height: 6;
+  width: 2 * (4 * (2 + (1 + 6))) - 1;
+  height: ((2 + 3) * (2 + 3) / (9 - 4)) + 1;
 }
 .mixed-units {
   margin: 2px 4em 1 5pc;

data/lib/less/js/test/css/selectors.css

@@ -116,18 +116,26 @@ p a span {
 .blood {
   color: red;
 }
-.blood {
-  color: red;
-}
 .bloodred {
   color: green;
 }
 #blood.blood.red.black {
   color: black;
 }
-:nth-child(3):nth-child(3) {
-  second-use: deprecated;
+:nth-child(3) {
+  selector: interpolated;
 }
-.test:nth-child(odd):not( :nth-child(3)) {
+.test:nth-child(odd):not(:nth-child(3)) {
   color: #ff0000;
 }
+[prop],
+[prop="value3"],
+[prop*="val3"],
+[|prop~="val3"],
+[*|prop$="val3"],
+[ns|prop^="val3"],
+[3^="val3"],
+[3=3],
+[3] {
+  attributes: yes;
+}

data/lib/less/js/test/css/urls.css

@@ -1,12 +1,16 @@
 @import "import/../css/background.css";
 
 @import "import/import-test-d.css";
+
+@import "file.css";
 @font-face {
   src: url("/fonts/garamond-pro.ttf");
   src: local(Futura-Medium), url(fonts.svg#MyGeometricModern) format("svg");
 }
 #shorthands {
   background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
+  background: url("img.jpg") center / 100px;
+  background: #ffffff url(image.png) center / 1px 100px repeat-x scroll content-box padding-box;
 }
 #misc {
   background-image: url(images/image.jpg);
@@ -40,3 +44,16 @@
 #secret {
   font-family: xecret, sans-serif;
 }
+#data-uri {
+  uri: url('data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==');
+}
+#data-uri-guess {
+  uri: url('data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==');
+}
+#data-uri-ascii {
+  uri-1: url('data:text/html,%3Ch1%3EThis%20page%20is%20100%25%20Awesome.%3C%2Fh1%3E%0A');
+  uri-2: url('data:text/html,%3Ch1%3EThis%20page%20is%20100%25%20Awesome.%3C%2Fh1%3E%0A');
+}
+#data-uri-toobig {
+  uri: url('../data/data-uri-fail.png');
+}

data/lib/less/js/test/css/variables.css

@@ -7,10 +7,14 @@
   font-family: "Trebuchet MS", Verdana, sans-serif;
   quotes: "~" "~";
 }
-.redefinition {
+.redef {
+  zero: 0;
+}
+.redef .inition {
   three: 3;
 }
 .values {
+  minus-one: -1;
   font-family: 'Trebuchet', 'Trebuchet', 'Trebuchet';
   color: #888888 !important;
   multi: something 'A', B, C, 'Trebuchet';
@@ -21,6 +25,21 @@
 .alpha {
   filter: alpha(opacity=42);
 }
-a:nth-child(2) {
-  border: 1px;
+.testPollution {
+  a: 'no-pollution';
+}
+.units {
+  width: 1px;
+  same-unit-as-previously: 1px;
+  square-pixel-divided: 1px;
+  odd-unit: 2;
+  percentage: 500%;
+  pixels: 500px;
+  conversion-metric-a: 30mm;
+  conversion-metric-b: 3cm;
+  conversion-imperial: 3in;
+  custom-unit: 420octocats;
+  custom-unit-cancelling: 18dogs;
+  mix-units: 2px;
+  invalid-units: 1px;
 }

data/lib/less/js/test/data/page.html

@@ -0,0 +1 @@
+<h1>This page is 100% Awesome.</h1>

data/lib/less/js/test/less-test.js

@@ -5,6 +5,8 @@ var path = require('path'),
 var less = require('../lib/less');
 var stylize = require('../lib/less/lessc_helper').stylize;
 
+var globals = Object.keys(global);
+
 var oneTestOnly = process.argv[2];
 
 var totalTests = 0,
@@ -23,9 +25,9 @@ less.tree.functions._color = function (str) {
 
 sys.puts("\n" + stylize("LESS", 'underline') + "\n");
 
-runTestSet({relativeUrls: true});
+runTestSet({strictMath: true, relativeUrls: true, silent: true});
 
-runTestSet(null, "errors/", function(name, err, compiledLess, doReplacements) {
+runTestSet({strictMath: true, strictUnits: true}, "errors/", function(name, err, compiledLess, doReplacements) {
     fs.readFile(path.join('test/less/', name) + '.txt', 'utf8', function (e, expectedErr) {
         sys.print("- " + name + ": ");
         expectedErr = doReplacements(expectedErr, 'test/less/errors/');
@@ -48,22 +50,27 @@ runTestSet(null, "errors/", function(name, err, compiledLess, doReplacements) {
         return input.replace(
             "{path}", path.join(process.cwd(), "/test/less/errors/"))
             .replace("{pathrel}", path.join("test", "less", "errors/"))
+            .replace("{pathhref}", "")
+            .replace("{404status}", "")
             .replace(/\r\n/g, '\n');
     });
 
-runTestSet({dumpLineNumbers: 'comments'}, "debug/", null,
+runTestSet({strictMath: true, dumpLineNumbers: 'comments'}, "debug/", null,
            function(name) { return name + '-comments'; });
-runTestSet({dumpLineNumbers: 'mediaquery'}, "debug/", null,
+runTestSet({strictMath: true, dumpLineNumbers: 'mediaquery'}, "debug/", null,
            function(name) { return name + '-mediaquery'; });
-runTestSet({dumpLineNumbers: 'all'}, "debug/", null,
+runTestSet({strictMath: true, dumpLineNumbers: 'all'}, "debug/", null,
            function(name) { return name + '-all'; });
-runTestSet({relativeUrls: false, rootpath: "folder (1)/"}, "static-urls/");
+runTestSet({strictMath: true, relativeUrls: false, rootpath: "folder (1)/"}, "static-urls/");
+runTestSet({strictMath: true, compress: true}, "compression/");
+runTestSet({ }, "legacy/");
+testNoOptions();
 
 function globalReplacements(input, directory) {
     var p = path.join(process.cwd(), directory),
         pathimport = path.join(process.cwd(), directory + "import/"),
-        pathesc = p.replace(/[.:\/]/g, '\\$&'),
-        pathimportesc = pathimport.replace(/[.:\/]/g, '\\$&');
+        pathesc = p.replace(/[.:/\\]/g, function(a) { return '\\' + (a=='\\' ? '\/' : a); }),
+        pathimportesc = pathimport.replace(/[.:/\\]/g, function(a) { return '\\' + (a=='\\' ? '\/' : a); });
 
     return input.replace(/\{path\}/g, p)
             .replace(/\{pathesc\}/g, pathesc)
@@ -72,6 +79,12 @@ function globalReplacements(input, directory) {
             .replace(/\r\n/g, '\n');
 }
 
+function checkGlobalLeaks() {
+    return Object.keys(global).filter(function(v) {
+        return globals.indexOf(v) < 0;
+    });
+}
+
 function runTestSet(options, foldername, verifyFunction, nameModifier, doReplacements) {
     foldername = foldername || "";
 
@@ -142,6 +155,7 @@ function ok(msg) {
 }
 
 function endTest() {
+    var leaked = checkGlobalLeaks();
     if (failedTests + passedTests === totalTests) {
         sys.puts("");
         sys.puts("");
@@ -153,6 +167,12 @@ function endTest() {
             sys.print(stylize("All Passed ", "green"));
             sys.print(passedTests + " run");
         }
+        if (leaked.length > 0) {
+            sys.puts("");
+            sys.puts("");
+            sys.print(stylize("Global leak detected: ", "red") + leaked.join(', '));
+            sys.print("\n");
+        }
     }
 }
 
@@ -171,7 +191,7 @@ function toCSS(options, path, callback) {
                 callback(err);
             } else {
                 try {
-                    css = tree.toCSS();
+                    css = tree.toCSS(options);
                     callback(null, css);
                 } catch (e) {
                     callback(e);
@@ -180,3 +200,15 @@ function toCSS(options, path, callback) {
         });
     });
 }
+
+function testNoOptions() {
+    totalTests++;
+    try {
+        sys.print("- Integration - creating parser without options: ");
+        new(less.Parser);
+    } catch(e) {
+        fail(stylize("FAIL\n", "red"));
+        return;
+    }
+    ok(stylize("OK\n", "green"));
+}

data/lib/less/js/test/less/colors.less

@@ -33,10 +33,10 @@
 }
 
 #overflow {
-  .a { color: #111111 - #444444; } // #000000
-  .b { color: #eee + #fff; } // #ffffff
-  .c { color: #aaa * 3; } // #ffffff
-  .d { color: #00ee00 + #009900; } // #00ff00
+  .a { color: (#111111 - #444444); } // #000000
+  .b { color: (#eee + #fff); } // #ffffff
+  .c { color: (#aaa * 3); } // #ffffff
+  .d { color: (#00ee00 + #009900); } // #00ff00
 }
 
 #grey {