less 2.3.0 → 2.3.1

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

@@ -1,5 +1,7 @@
 #hidden {
   color: transparent;
+}
+#hidden1 {
   color: transparent;
 }
 .two-args {
@@ -49,10 +51,6 @@ body {
 #var-inside {
   width: 10px;
 }
-.id-class {
-  color: red;
-  color: red;
-}
 .arguments {
   border: 1px solid #000000;
   width: 1px;
@@ -74,3 +72,24 @@ body {
   border: "{";
   width: "{";
 }
+.comma-vs-semi-colon {
+  one: a;
+  two: b, c;
+  one: d, e;
+  two: f;
+  one: g;
+  one: h;
+  one: i;
+  one: j;
+  one: k;
+  two: l;
+  one: m, n;
+  one: o, p;
+  two: q;
+  one: r, s;
+  two: t;
+}
+#named-conflict {
+  four: a, 11, 12, 13;
+  four: a, 21, 22, 23;
+}

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

@@ -56,3 +56,16 @@
   content: not false;
   content: not false and false, not false;
 }
+.equality-units {
+  test: pass;
+}
+.colorguardtest {
+  content: is #ff0000;
+  content: is not #0000ff its #ff0000;
+  content: is not #0000ff its #800080;
+}
+.stringguardtest {
+  content: is theme1;
+  content: is not theme2;
+  content: is theme1 no quotes;
+}

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

@@ -15,3 +15,24 @@
   border: 9;
   boxer: 9;
 }
+.class .inner {
+  test: 1;
+}
+.class .inner {
+  test: 2 !important;
+}
+.class .inner {
+  test: 3;
+}
+.class .inner {
+  test: 4 !important;
+}
+.class .inner {
+  test: 5;
+}
+.class .inner {
+  test: 0 !important;
+}
+.class .inner {
+  test: 9;
+}

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

@@ -0,0 +1,27 @@
+.named-arg {
+  color: blue;
+  width: 5px;
+  height: 99%;
+  args: 1px 100%;
+  text-align: center;
+}
+.class {
+  width: 5px;
+  height: 19%;
+  args: 1px 20%;
+}
+.all-args-wrong-args {
+  width: 10px;
+  height: 9%;
+  args: 2px 10%;
+}
+.named-args2 {
+  width: 15px;
+  height: 49%;
+  color: #646464;
+}
+.named-args3 {
+  width: 5px;
+  height: 29%;
+  color: #123456;
+}

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

@@ -61,11 +61,61 @@
 .jo.ki {
   background: none;
 }
+.amp.support {
+  color: orange;
+}
 .extended {
   width: 100%;
   border: 1px;
   background: none;
+  color: orange;
 }
 .foo .bar {
   width: 100%;
 }
+.underParents {
+  color: red;
+}
+.parent .underParents {
+  color: red;
+}
+* + h1 {
+  margin-top: 25px;
+}
+legend + h1 {
+  margin-top: 0;
+}
+h1 + * {
+  margin-top: 10px;
+}
+* + h2 {
+  margin-top: 20px;
+}
+legend + h2 {
+  margin-top: 0;
+}
+h2 + * {
+  margin-top: 8px;
+}
+* + h3 {
+  margin-top: 15px;
+}
+legend + h3 {
+  margin-top: 0;
+}
+h3 + * {
+  margin-top: 5px;
+}
+.error {
+  background-image: "/a.png";
+  background-position: center center;
+}
+.test-rec .recursion {
+  color: black;
+}
+.button {
+  padding-left: 44px;
+}
+.button.large {
+  padding-left: 40em;
+}

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

@@ -13,3 +13,23 @@
   border-color: #000000;
   background-color: #ffffff;
 }
+.scope {
+  scoped-val: #008000;
+}
+.heightIsSet {
+  height: 1024px;
+}
+.useHeightInMixinCall {
+  mixin-height: 1024px;
+}
+.imported {
+  exists: true;
+}
+.testImported {
+  exists: true;
+}
+#allAreUsedHere {
+  default: 'top level';
+  scope: 'top level';
+  sub-scope-only: 'inside';
+}

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

@@ -51,10 +51,56 @@ p a span {
 .qux .foo .baz {
   display: inline;
 }
+.qux.foo .bar,
+.qux.foo .baz {
+  display: inline-block;
+}
 .qux .foo .bar .biz,
 .qux .foo .baz .biz {
   display: none;
 }
+.a.b.c {
+  color: red;
+}
+.c .b.a {
+  color: red;
+}
+.foo .p.bar {
+  color: red;
+}
+.foo.p.bar {
+  color: red;
+}
+.foo + .foo {
+  background: amber;
+}
+.foo + .foo {
+  background: amber;
+}
+.foo + .foo,
+.foo + .bar,
+.bar + .foo,
+.bar + .bar {
+  background: amber;
+}
+.foo a > .foo a,
+.foo a > .bar a,
+.foo a > .foo b,
+.foo a > .bar b,
+.bar a > .foo a,
+.bar a > .bar a,
+.bar a > .foo b,
+.bar a > .bar b,
+.foo b > .foo a,
+.foo b > .bar a,
+.foo b > .foo b,
+.foo b > .bar b,
+.bar b > .foo a,
+.bar b > .bar a,
+.bar b > .foo b,
+.bar b > .bar b {
+  background: amber;
+}
 .other ::fnord {
   color: #ff0000;
 }
@@ -67,3 +113,21 @@ p a span {
 .other::bnord {
   color: #ff0000;
 }
+.blood {
+  color: red;
+}
+.blood {
+  color: red;
+}
+.bloodred {
+  color: green;
+}
+#blood.blood.red.black {
+  color: black;
+}
+:nth-child(3):nth-child(3) {
+  second-use: deprecated;
+}
+.test:nth-child(odd):not( :nth-child(3)) {
+  color: #ff0000;
+}

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

@@ -0,0 +1,42 @@
+@import "folder (1)/../css/background.css";
+
+@import "folder (1)/import-test-d.css";
+@font-face {
+  src: url("/fonts/garamond-pro.ttf");
+  src: local(Futura-Medium), url(folder\ \(1\)/fonts.svg#MyGeometricModern) format("svg");
+}
+#shorthands {
+  background: url("http://www.lesscss.org/spec.html") no-repeat 0 4px;
+}
+#misc {
+  background-image: url(folder\ \(1\)/images/image.jpg);
+}
+#data-uri {
+  background: url(data:image/png;charset=utf-8;base64,
+    kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/
+    k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U
+    kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
+  background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700);
+}
+#svg-data-uri {
+  background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
+}
+.comma-delimited {
+  background: url(folder\ \(1\)/bg.jpg) no-repeat, url(folder\ \(1\)/bg.png) repeat-x top left, url(folder\ \(1\)/bg);
+}
+.values {
+  url: url('folder (1)/Trebuchet');
+}
+#logo {
+  width: 100px;
+  height: 100px;
+  background: url('folder (1)/../assets/logo.png');
+}
+@font-face {
+  font-family: xecret;
+  src: url('folder (1)/../assets/xecret.ttf');
+}
+#secret {
+  font-family: xecret, sans-serif;
+}

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

@@ -30,11 +30,11 @@
   url2: "http://lesscss.org/image-256.jpg";
   url3: "http://lesscss.org#445566";
   url4: "http://lesscss.org/hello";
-  url5: "http://lesscss.org/54.4";
+  url5: "http://lesscss.org/54.4px";
 }
 .mix-mul-class {
   color: #0000ff;
   color: #ff0000;
-  color: #0000ff;
+  color: #000000;
   color: #ffa500;
 }

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

@@ -0,0 +1,42 @@
+@import "import/../css/background.css";
+
+@import "import/import-test-d.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;
+}
+#misc {
+  background-image: url(images/image.jpg);
+}
+#data-uri {
+  background: url(data:image/png;charset=utf-8;base64,
+    kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/
+    k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U
+    kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
+  background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700);
+}
+#svg-data-uri {
+  background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
+}
+.comma-delimited {
+  background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg);
+}
+.values {
+  url: url('Trebuchet');
+}
+#logo {
+  width: 100px;
+  height: 100px;
+  background: url('import/imports/../assets/logo.png');
+}
+@font-face {
+  font-family: xecret;
+  src: url('import/imports/../assets/xecret.ttf');
+}
+#secret {
+  font-family: xecret, sans-serif;
+}

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

@@ -13,7 +13,6 @@
 .values {
   font-family: 'Trebuchet', 'Trebuchet', 'Trebuchet';
   color: #888888 !important;
-  url: url('Trebuchet');
   multi: something 'A', B, C, 'Trebuchet';
 }
 .variable-names {

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

@@ -36,3 +36,7 @@
           solid
           black;
 }
+.sel .newline_ws .tab_ws {
+  color: white;
+  background-position: 45 -23;
+}

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

@@ -3,47 +3,170 @@ var path = require('path'),
     sys = require('util');
 
 var less = require('../lib/less');
+var stylize = require('../lib/less/lessc_helper').stylize;
+
+var oneTestOnly = process.argv[2];
+
+var totalTests = 0,
+    failedTests = 0,
+    passedTests = 0;
 
 less.tree.functions.add = function (a, b) {
     return new(less.tree.Dimension)(a.value + b.value);
-}
+};
 less.tree.functions.increment = function (a) {
     return new(less.tree.Dimension)(a.value + 1);
-}
+};
 less.tree.functions._color = function (str) {
     if (str.value === "evil red") { return new(less.tree.Color)("600") }
-}
+};
 
 sys.puts("\n" + stylize("LESS", 'underline') + "\n");
 
-fs.readdirSync('test/less').forEach(function (file) {
-    if (! /\.less/.test(file)) { return }
+runTestSet({relativeUrls: true});
 
-    toCSS('test/less/' + file, function (err, less) {
-        var name = path.basename(file, '.less');
-
-        fs.readFile(path.join('test/css', name) + '.css', 'utf-8', function (e, css) {
-            sys.print("- " + name + ": ")
-            if (less === css) { sys.print(stylize('OK', 'green')) }
-            else if (err) {
-                sys.print(stylize("ERROR: " + (err && err.message), 'red'));
+runTestSet(null, "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/');
+        if (!err) {
+            if (compiledLess) {
+                fail("No Error", 'red');
+            } else {
+                fail("No Error, No Output");
+            }
+        } else {
+            var errMessage = less.formatError(err);
+            if (errMessage === expectedErr) {
+                ok('OK');                    
             } else {
-                sys.print(stylize("FAIL", 'yellow'));
+                difference("FAIL", expectedErr, errMessage);
+            }
+        }
+        sys.puts("");
+    });}, null, function(input, directory) {
+        return input.replace(
+            "{path}", path.join(process.cwd(), "/test/less/errors/"))
+            .replace("{pathrel}", path.join("test", "less", "errors/"))
+            .replace(/\r\n/g, '\n');
+    });
+
+runTestSet({dumpLineNumbers: 'comments'}, "debug/", null,
+           function(name) { return name + '-comments'; });
+runTestSet({dumpLineNumbers: 'mediaquery'}, "debug/", null,
+           function(name) { return name + '-mediaquery'; });
+runTestSet({dumpLineNumbers: 'all'}, "debug/", null,
+           function(name) { return name + '-all'; });
+runTestSet({relativeUrls: false, rootpath: "folder (1)/"}, "static-urls/");
+
+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, '\\$&');
+
+    return input.replace(/\{path\}/g, p)
+            .replace(/\{pathesc\}/g, pathesc)
+            .replace(/\{pathimport\}/g, pathimport)
+            .replace(/\{pathimportesc\}/g, pathimportesc)
+            .replace(/\r\n/g, '\n');
+}
+
+function runTestSet(options, foldername, verifyFunction, nameModifier, doReplacements) {
+    foldername = foldername || "";
+
+    if(!doReplacements)
+        doReplacements = globalReplacements;
+
+    fs.readdirSync(path.join('test/less/', foldername)).forEach(function (file) {
+        if (! /\.less/.test(file)) { return }
+        
+        var name = foldername + path.basename(file, '.less');
+        
+        if (oneTestOnly && name !== oneTestOnly) { return; }
+        
+        totalTests++;
+
+        toCSS(options, path.join('test/less/', foldername + file), function (err, less) {
+
+            if (verifyFunction) {
+                return verifyFunction(name, err, less, doReplacements);
             }
-            sys.puts("");
+            var css_name = name;
+            if(nameModifier) css_name=nameModifier(name);
+            fs.readFile(path.join('test/css', css_name) + '.css', 'utf8', function (e, css) {
+                sys.print("- " + css_name + ": ")
+                
+                css = css && doReplacements(css, 'test/less/' + foldername);
+                if (less === css) { ok('OK'); }
+                else if (err) {
+                    fail("ERROR: " + (err && err.message));
+                } else {
+                    difference("FAIL", css, less);
+                }
+                sys.puts("");
+            });
         });
     });
-});
+}
+
+function diff(left, right) {
+    sys.puts("");
+    require('diff').diffLines(left, right).forEach(function(item) {
+      if(item.added || item.removed) {
+        sys.print(stylize(item.value, item.added ? 'green' : 'red'));
+      } else {
+        sys.print(item.value);
+      }
+    });
+}
+
+function fail(msg) {
+    sys.print(stylize(msg, 'red'));
+    failedTests++;
+    endTest();
+}
 
-function toCSS(path, callback) {
+function difference(msg, left, right) {
+    sys.print(stylize(msg, 'yellow'));
+    failedTests++;
+                
+    diff(left, right);
+    endTest();
+}
+
+function ok(msg) {
+    sys.print(stylize(msg, 'green'));
+    passedTests++;
+    endTest();
+}
+
+function endTest() {
+    if (failedTests + passedTests === totalTests) {
+        sys.puts("");
+        sys.puts("");
+        if (failedTests > 0) {
+            sys.print(failedTests);
+            sys.print(stylize(" Failed", "red"));
+            sys.print(", " + passedTests + " passed");
+        } else {
+            sys.print(stylize("All Passed ", "green"));
+            sys.print(passedTests + " run");
+        }
+    }
+}
+
+function toCSS(options, path, callback) {
     var tree, css;
-    fs.readFile(path, 'utf-8', function (e, str) {
+    options = options || {};
+    fs.readFile(path, 'utf8', function (e, str) {
         if (e) { return callback(e) }
+        
+        options.paths = [require('path').dirname(path)];
+        options.filename = require('path').resolve(process.cwd(), path);
+        options.optimization = options.optimization || 0;
 
-        new(less.Parser)({
-            paths: [require('path').dirname(path)],
-            optimization: 0
-        }).parse(str, function (err, tree) {
+        new(less.Parser)(options).parse(str, function (err, tree) {
             if (err) {
                 callback(err);
             } else {
@@ -57,17 +180,3 @@ function toCSS(path, callback) {
         });
     });
 }
-
-// Stylize a string
-function stylize(str, style) {
-    var styles = {
-        'bold'      : [1,  22],
-        'inverse'   : [7,  27],
-        'underline' : [4,  24],
-        'yellow'    : [33, 39],
-        'green'     : [32, 39],
-        'red'       : [31, 39]
-    };
-    return '\033[' + styles[style][0] + 'm' + str +
-           '\033[' + styles[style][1] + 'm';
-}