Fixes #3325 #3313 #3328 - each() function fixes

lib/less/functions/list.js

@@ -1,4 +1,5 @@
-var Dimension = require('../tree/dimension'),
+var Comment = require('../tree/comment'),
+    Dimension = require('../tree/dimension'),
     Declaration = require('../tree/declaration'),
     Ruleset = require('../tree/ruleset'),
     Selector = require('../tree/selector'),
@@ -27,7 +28,7 @@ functionRegistry.addMultiple({
         return new Dimension(getItemsFromNode(values).length);
     },
     each: function(list, rs) {
-        var i = 0, rules = [], newRules, iterator;
+        var rules = [], newRules, iterator;
 
         if (list.value) {
             if (Array.isArray(list.value)) {
@@ -37,6 +38,8 @@ functionRegistry.addMultiple({
             }
         } else if (list.ruleset) {
             iterator = list.ruleset.rules;
+        } else if (list.rules) {
+            iterator = list.rules;
         } else if (Array.isArray(list)) {
             iterator = list;
         } else {
@@ -55,17 +58,20 @@ functionRegistry.addMultiple({
         } else {
             rs = rs.ruleset;
         }
-
-        iterator.forEach(function(item) {
-            i = i + 1;
-            var key, value;
+
+        for (var i = 0; i < iterator.length; i++) {
+            var key, value, item = iterator[i];
             if (item instanceof Declaration) {
                 key = typeof item.name === 'string' ? item.name : item.name[0].value;
                 value = item.value;
             } else {
-                key = new Dimension(i);
+                key = new Dimension(i + 1);
                 value = item;
             }
+
+            if (item instanceof Comment) {
+                continue;
+            }
 
             newRules = rs.rules.slice(0);
             if (valueName) {
@@ -75,7 +81,7 @@ functionRegistry.addMultiple({
             }
             if (indexName) {
                 newRules.push(new Declaration(indexName,
-                    new Dimension(i),
+                    new Dimension(i + 1),
                     false, false, this.index, this.currentFileInfo));
             }
             if (keyName) {
@@ -89,7 +95,7 @@ functionRegistry.addMultiple({
                 rs.strictImports,
                 rs.visibilityInfo()
             ));
-        });
+        }
 
         return new Ruleset([ new(Selector)([ new Element("", '&') ]) ],
                 rules,

lib/less/index.js

@@ -2,7 +2,7 @@ module.exports = function(environment, fileManagers) {
     var SourceMapOutput, SourceMapBuilder, ParseTree, ImportManager, Environment;
 
     var initial = {
-        version: [3, 8, 1],
+        version: [3, 8, 2],
         data: require('./data'),
         tree: require('./tree'),
         Environment: (Environment = require('./environment/environment')),

lib/less/tree/variable-call.js

@@ -17,16 +17,19 @@ VariableCall.prototype.eval = function (context) {
         error = new LessError({message: 'Could not evaluate variable call ' + this.variable});
 
     if (!detachedRuleset.ruleset) {
-        if (Array.isArray(detachedRuleset)) {
+        if (detachedRuleset.rules) {
             rules = detachedRuleset;
         }
+        else if (Array.isArray(detachedRuleset)) {
+            rules = new Ruleset('', detachedRuleset);
+        }
         else if (Array.isArray(detachedRuleset.value)) {
-            rules = detachedRuleset.value;
+            rules = new Ruleset('', detachedRuleset.value);
         }
         else {
             throw error;
         }
-        detachedRuleset = new DetachedRuleset(new Ruleset('', rules));
+        detachedRuleset = new DetachedRuleset(rules);
     }
     if (detachedRuleset.ruleset) {
         return detachedRuleset.callEval(context);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {
@@ -51,7 +51,6 @@
     "source-map": "~0.6.0"
   },
   "devDependencies": {
-    "bootstrap": "3.3.7",
     "bootstrap-less-port": "0.3.0",
     "diff": "^3.2.0",
     "git-rev": "^0.2.1",