Merge remote-tracking branch 'upstream/master' into image-size

less · Apr 1, 2015 · ea43e7d · ea43e7d
2 parents 16a0285 + fc93876
commit ea43e7d
Show file tree

Hide file tree

Showing 29 changed files with 229 additions and 90 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -36,7 +36,7 @@ module.exports = function (grunt) {
                 command: 'node test'
             },
             benchmark: {
-                command: 'node benchmark/less-benchmark.js'
+                command: 'node benchmark/index.js'
             },
             "sourcemap-test": {
                 command: [

diff --git a/lib/less-rhino/index.js b/lib/less-rhino/index.js
@@ -1,5 +1,6 @@
-/*jshint rhino:true, unused: false */
-/*global name:true, less, loadStyleSheet, os */
+/* jshint rhino:true, unused: false */
+/* jscs:disable validateIndentation */
+/* global name:true, less, loadStyleSheet, os */
 
 function formatError(ctx, options) {
     options = options || {};

diff --git a/lib/less/parser/parser-input.js b/lib/less/parser/parser-input.js
@@ -166,8 +166,7 @@ module.exports = function() {
         currentPos = parserInput.i;
 
         if (!current.length) {
-            if (j < chunks.length - 1)
-            {
+            if (j < chunks.length - 1) {
                 current = chunks[++j];
                 skipWhitespace(0); // skip space at the beginning of a chunk
                 return true; // things changed

diff --git a/lib/less/parser/parser.js b/lib/less/parser/parser.js
@@ -240,8 +240,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             primary: function () {
                 var mixin = this.mixin, root = [], node;
 
-                while (true)
-                {
+                while (true) {
                     while (true) {
                         node = this.comment();
                         if (!node) { break; }
@@ -1207,8 +1206,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                         features = features && new(tree.Value)(features);
                         return new(tree.Import)(path, features, options, index, fileInfo);
                     }
-                    else
-                    {
+                    else {
                         parserInput.i = index;
                         error("malformed import statement");
                     }
@@ -1360,8 +1358,7 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                         return new(tree.Import)(path, null, options, index, fileInfo);
                     }
-                    else
-                    {
+                    else {
                         parserInput.i = index;
                         error("malformed plugin statement");
                     }

diff --git a/lib/less/source-map-output.js b/lib/less/source-map-output.js
@@ -105,8 +105,7 @@ module.exports = function (environment) {
 
         if (this._outputSourceFiles) {
             for (var filename in this._contentsMap) {
-                if (this._contentsMap.hasOwnProperty(filename))
-                {
+                if (this._contentsMap.hasOwnProperty(filename)) {
                     var source = this._contentsMap[filename];
                     if (this._contentsIgnoredCharsMap[filename]) {
                         source = source.slice(this._contentsIgnoredCharsMap[filename]);

diff --git a/lib/less/tree/dimension.js b/lib/less/tree/dimension.js
@@ -127,7 +127,7 @@ Dimension.prototype.convertTo = function (conversions) {
         conversions = derivedConversions;
     }
     applyUnit = function (atomicUnit, denominator) {
-      /*jshint loopfunc:true */
+        /* jshint loopfunc:true */
         if (group.hasOwnProperty(atomicUnit)) {
             if (denominator) {
                 value = value / (group[atomicUnit] / group[targetUnit]);

diff --git a/lib/less/tree/import.js b/lib/less/tree/import.js
@@ -82,9 +82,11 @@ Import.prototype.isVariableImport = function () {
 };
 Import.prototype.evalForImport = function (context) {
     var path = this.path;
+
     if (path instanceof URL) {
         path = path.value;
     }
+
     return new Import(path.eval(context), this.features, this.options, this.index, this.currentFileInfo);
 };
 Import.prototype.evalPath = function (context) {
@@ -108,6 +110,14 @@ Import.prototype.eval = function (context) {
     var ruleset, registry,
         features = this.features && this.features.eval(context);
 
+    if (this.options.plugin) {
+        registry = context.frames[0] && context.frames[0].functionRegistry;
+        if ( registry && this.root && this.root.functions ) {
+            registry.addMultiple( this.root.functions );
+        }
+        return [];
+    }
+
     if (this.skip) {
         if (typeof this.skip === "function") {
             this.skip = this.skip();
@@ -117,13 +127,7 @@ Import.prototype.eval = function (context) {
         }
     }
 
-    if (this.options.plugin) {
-        registry = context.frames[0] && context.frames[0].functionRegistry;
-        if ( registry && this.root.functions ) {
-            registry.addMultiple( this.root.functions );
-        }
-        return [];
-    } else if (this.options.inline) {
+    if (this.options.inline) {
         var contents = new Anonymous(this.root, 0, {filename: this.importedFilename}, true, true);
         return this.features ? new Media([contents], this.features.value) : [contents];
     } else if (this.css) {

diff --git a/lib/less/tree/media.js b/lib/less/tree/media.js
@@ -59,6 +59,7 @@ Media.prototype.eval = function (context) {
     context.mediaPath.push(media);
     context.mediaBlocks.push(media);
 
+    this.rules[0].functionRegistry = context.frames[0].functionRegistry.inherit();
     context.frames.unshift(this.rules[0]);
     media.rules = [this.rules[0].eval(context)];
     context.frames.shift();

diff --git a/lib/less/tree/mixin-definition.js b/lib/less/tree/mixin-definition.js
@@ -43,8 +43,10 @@ Definition.prototype.evalParams = function (context, mixinEnv, args, evaldArgume
         params = this.params.slice(0),
         i, j, val, name, isNamedFound, argIndex, argsLength = 0;
 
+    if (mixinEnv.frames && mixinEnv.frames[0] && mixinEnv.frames[0].functionRegistry) {
+        frame.functionRegistry = mixinEnv.frames[0].functionRegistry.inherit();
+    }
     mixinEnv = new contexts.Eval(mixinEnv, [frame].concat(mixinEnv.frames));
-    frame.functionRegistry = context.frames[0].functionRegistry.inherit();
 
     if (args) {
         args = args.slice(0);

diff --git a/lib/less/tree/ruleset.js b/lib/less/tree/ruleset.js
@@ -69,7 +69,16 @@ Ruleset.prototype.eval = function (context) {
 
     // inherit a function registry from the frames stack when possible;
     // otherwise from the global registry
-    ruleset.functionRegistry = ((context.frames[0] && context.frames[0].functionRegistry) || globalFunctionRegistry).inherit();
+    ruleset.functionRegistry = (function (frames) {
+        var i = 0,
+            n = frames.length,
+            found;
+        for ( ; i !== n ; ++i ) {
+            found = frames[ i ].functionRegistry;
+            if ( found ) { return found; }
+        }
+        return globalFunctionRegistry;
+    }(context.frames)).inherit();
 
     // push the current ruleset to the frames stack
     var ctxFrames = context.frames;

diff --git a/lib/less/visitors/extend-visitor.js b/lib/less/visitors/extend-visitor.js
@@ -198,8 +198,7 @@ ProcessExtendsVisitor.prototype = {
             if (iterationCount > 100) {
                 var selectorOne = "{unable to calculate}";
                 var selectorTwo = "{unable to calculate}";
-                try
-                {
+                try {
                     selectorOne = extendsToAdd[0].selfSelectors[0].toCSS();
                     selectorTwo = extendsToAdd[0].selector.toCSS();
                 }

diff --git a/lib/less/visitors/import-visitor.js b/lib/less/visitors/import-visitor.js
@@ -103,6 +103,7 @@ ImportVisitor.prototype = {
 
         var importVisitor = this,
             inlineCSS = importNode.options.inline,
+            isPlugin = importNode.options.plugin,
             duplicateImport = importedAtRoot || fullPath in importVisitor.recursionDetector;
 
         if (!context.importMultiple) {
@@ -123,7 +124,7 @@ ImportVisitor.prototype = {
             importNode.root = root;
             importNode.importedFilename = fullPath;
 
-            if (!inlineCSS && (context.importMultiple || !duplicateImport)) {
+            if (!inlineCSS && !isPlugin && (context.importMultiple || !duplicateImport)) {
                 importVisitor.recursionDetector[fullPath] = true;
 
                 var oldContext = this.context;
@@ -144,7 +145,16 @@ ImportVisitor.prototype = {
         }
     },
     visitRule: function (ruleNode, visitArgs) {
-        visitArgs.visitDeeper = false;
+        if (ruleNode.value.type === "DetachedRuleset") {
+            this.context.frames.unshift(ruleNode);
+        } else {
+            visitArgs.visitDeeper = false;
+        }
+    },
+    visitRuleOut : function(ruleNode) {
+        if (ruleNode.value.type === "DetachedRuleset") {
+            this.context.frames.shift();
+        }
     },
     visitDirective: function (directiveNode, visitArgs) {
         this.context.frames.unshift(directiveNode);

diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
   "jam": {
     "main": "./dist/less.js"
   },
+  "browser": "./dist/less.js",
   "engines": {
     "node": ">=0.10.0"
   },
@@ -58,7 +59,7 @@
     "grunt-contrib-jasmine": "^0.8.2",
     "grunt-contrib-jshint": "^0.11.0",
     "grunt-contrib-uglify": "^0.8.0",
-    "grunt-jscs": "^1.2.0",
+    "grunt-jscs": "^1.6.0",
     "grunt-shell": "^1.1.1",
     "grunt-browserify": "~3.5.0",
     "jit-grunt": "^0.9.1",

diff --git a/test/browser/runner-global-vars-options.js b/test/browser/runner-global-vars-options.js
@@ -3,4 +3,5 @@ var less = {
     errorReporting: "console",
     globalVars: {
         "@global-var": "red"
-}};
+    }
+};
diff --git a/test/browser/runner-main-options.js b/test/browser/runner-main-options.js
@@ -4,15 +4,15 @@ var less = {
 };
 less.strictMath = true;
 less.functions = {
-  add: function(a, b) {
-      return new(less.tree.Dimension)(a.value + b.value);
-  },
-  increment: function(a) {
-      return new(less.tree.Dimension)(a.value + 1);
-  },
-  _color: function(str) {
-      if (str.value === "evil red") {
-          return new(less.tree.Color)("600");
-      }
-  }
+    add: function(a, b) {
+        return new(less.tree.Dimension)(a.value + b.value);
+    },
+    increment: function(a) {
+        return new(less.tree.Dimension)(a.value + 1);
+    },
+    _color: function(str) {
+        if (str.value === "evil red") {
+            return new(less.tree.Color)("600");
+        }
+    }
 };
diff --git a/test/css/import-plugin-scoped.css b/test/css/import-plugin-scoped.css
diff --git a/test/css/import-plugin-tiered.css b/test/css/import-plugin-tiered.css
diff --git a/test/css/import-plugin.css b/test/css/import-plugin.css
diff --git a/test/css/plugin.css b/test/css/plugin.css
@@ -0,0 +1,44 @@
+.other {
+  trans: transitive;
+}
+.class {
+  trans: transitive;
+  global: global;
+  local: test-local();
+  shadow: global;
+}
+.class .local {
+  global: global;
+  local: local;
+  shadow: local;
+}
+.class {
+  ns-mixin-global: global;
+  ns-mixin-local: local;
+  ns-mixin-shadow: local;
+  mixin-local: local;
+  mixin-global: global;
+  mixin-shadow: local;
+  ruleset-local: local;
+  ruleset-global: global;
+  ruleset-shadow: local;
+  class-local: test-local();
+}
+@media screen {
+  .test {
+    result: global;
+  }
+}
+@font-face {
+  result: global;
+}
+@media screen and (min-width: 100px) and (max-width: 400px) {
+  .test {
+    result: global;
+  }
+}
+@media screen {
+  .test {
+    result: local;
+  }
+}
diff --git a/test/less/import-plugin-scoped.less b/test/less/import-plugin-scoped.less
diff --git a/test/less/import-plugin-tiered.less b/test/less/import-plugin-tiered.less
diff --git a/test/less/import-plugin.less b/test/less/import-plugin.less