Added the concept of inherited index / fileInfo for nodes

Author: matthew-dean

lib/less/environment/abstract-plugin-loader.js

@@ -52,8 +52,8 @@ AbstractPluginLoader.prototype.evalPlugin = function(contents, context, pluginOp
     registry = functionRegistry.create();
 
     try {
-        loader = new Function("module", "require", "functions", "tree", "fileInfo", "less", contents);
-        pluginObj = loader(localModule, this.require, registry, this.less.tree, fileInfo, this.less);
+        loader = new Function("module", "require", "functions", "tree", "fileInfo", contents);
+        pluginObj = loader(localModule, this.require, registry, this.less.tree, fileInfo);
 
         if (!pluginObj) {
             pluginObj = localModule.exports;

lib/less/functions/function-caller.js

@@ -11,8 +11,8 @@ var functionCaller = function(name, context, index, currentFileInfo) {
 functionCaller.prototype.isValid = function() {
     return Boolean(this.func);
 };
-functionCaller.prototype.call = function(args) {
 
+functionCaller.prototype.call = function(args) {
     // This code is terrible and should be replaced as per this issue...
     // https://github.com/less/less.js/issues/2477
     if (Array.isArray(args)) {

lib/less/tree/anonymous.js

@@ -2,17 +2,17 @@ var Node = require("./node");
 
 var Anonymous = function (value, index, currentFileInfo, mapLines, rulesetLike, visibilityInfo) {
     this.value = value;
-    this.index = index;
+    this._index = index;
+    this._fileInfo = currentFileInfo;
     this.mapLines = mapLines;
-    this.currentFileInfo = currentFileInfo;
     this.rulesetLike = (typeof rulesetLike === 'undefined') ? false : rulesetLike;
     this.allowRoot = true;
     this.copyVisibilityInfo(visibilityInfo);
 };
 Anonymous.prototype = new Node();
 Anonymous.prototype.type = "Anonymous";
 Anonymous.prototype.eval = function () {
-    return new Anonymous(this.value, this.index, this.currentFileInfo, this.mapLines, this.rulesetLike, this.visibilityInfo());
+    return new Anonymous(this.value, this._index, this._fileInfo, this.mapLines, this.rulesetLike, this.visibilityInfo());
 };
 Anonymous.prototype.compare = function (other) {
     return other.toCSS && this.toCSS() === other.toCSS() ? 0 : undefined;
@@ -21,6 +21,6 @@ Anonymous.prototype.isRulesetLike = function() {
     return this.rulesetLike;
 };
 Anonymous.prototype.genCSS = function (context, output) {
-    output.add(this.value, this.currentFileInfo, this.index, this.mapLines);
+    output.add(this.value, this._fileInfo, this._index, this.mapLines);
 };
 module.exports = Anonymous;

lib/less/tree/atrule.js

@@ -12,14 +12,15 @@ var AtRule = function (name, value, rules, index, currentFileInfo, debugInfo, is
             this.rules = rules;
         } else {
             this.rules = [rules];
-            this.rules[0].selectors = (new Selector([], null, null, this.index, currentFileInfo)).createEmptySelectors();
+            this.rules[0].selectors = (new Selector([], null, null, index, currentFileInfo)).createEmptySelectors();
         }
         for (i = 0; i < this.rules.length; i++) {
             this.rules[i].allowImports = true;
         }
+        this.setParent(this.rules, this);
     }
-    this.index = index;
-    this.currentFileInfo = currentFileInfo;
+    this._index = index;
+    this._fileInfo = currentFileInfo;
     this.debugInfo = debugInfo;
     this.isRooted = isRooted || false;
     this.copyVisibilityInfo(visibilityInfo);
@@ -45,7 +46,7 @@ AtRule.prototype.isCharset = function() {
 };
 AtRule.prototype.genCSS = function (context, output) {
     var value = this.value, rules = this.rules;
-    output.add(this.name, this.currentFileInfo, this.index);
+    output.add(this.name, this.fileInfo(), this.getIndex());
     if (value) {
         output.add(' ');
         value.genCSS(context, output);
@@ -80,7 +81,7 @@ AtRule.prototype.eval = function (context) {
     context.mediaBlocks = mediaBlocksBackup;
 
     return new AtRule(this.name, value, rules,
-        this.index, this.currentFileInfo, this.debugInfo, this.isRooted, this.visibilityInfo());
+        this.getIndex(), this.fileInfo(), this.debugInfo, this.isRooted, this.visibilityInfo());
 };
 AtRule.prototype.variable = function (name) {
     if (this.rules) {

lib/less/tree/call.js

@@ -6,8 +6,8 @@ var Node = require("./node"),
 var Call = function (name, args, index, currentFileInfo) {
     this.name = name;
     this.args = args;
-    this.index = index;
-    this.currentFileInfo = currentFileInfo;
+    this._index = index;
+    this._fileInfo = currentFileInfo;
 };
 Call.prototype = new Node();
 Call.prototype.type = "Call";
@@ -29,8 +29,8 @@ Call.prototype.accept = function (visitor) {
 //
 Call.prototype.eval = function (context) {
     var args = this.args.map(function (a) { return a.eval(context); }),
-        result, funcCaller = new FunctionCaller(this.name, context, this.index, this.currentFileInfo);
-
+        result, funcCaller = new FunctionCaller(this.name, context, this.getIndex(), this.fileInfo());
+    
     if (funcCaller.isValid()) {
         try {
             result = funcCaller.call(args);
@@ -39,24 +39,24 @@ Call.prototype.eval = function (context) {
                 type: e.type || "Runtime",
                 message: "error evaluating function `" + this.name + "`" +
                          (e.message ? ': ' + e.message : ''),
-                index: this.index, 
-                filename: this.currentFileInfo.filename,
+                index: this.getIndex(), 
+                filename: this.fileInfo().filename,
                 line: e.lineNumber,
                 column: e.columnNumber
             };
         }
 
         if (result != null) {
-            result.index = this.index;
-            result.currentFileInfo = this.currentFileInfo;
+            result._index = this._index;
+            result._fileInfo = this._fileInfo;
             return result;
         }
     }
 
-    return new Call(this.name, args, this.index, this.currentFileInfo);
+    return new Call(this.name, args, this.getIndex(), this.fileInfo());
 };
 Call.prototype.genCSS = function (context, output) {
-    output.add(this.name + "(", this.currentFileInfo, this.index);
+    output.add(this.name + "(", this.fileInfo(), this.getIndex());
 
     for (var i = 0; i < this.args.length; i++) {
         this.args[i].genCSS(context, output);

lib/less/tree/color.js

@@ -99,7 +99,7 @@ Color.prototype.toCSS = function (context, doNotCompress) {
 // we create a new Color node to hold the result.
 //
 Color.prototype.operate = function (context, op, other) {
-    var rgb = [];
+    var rgb = new Array(3);
     var alpha = this.alpha * (1 - other.alpha) + other.alpha;
     for (var c = 0; c < 3; c++) {
         rgb[c] = this._operate(context, op, this.rgb[c], other.rgb[c]);

lib/less/tree/comment.js

@@ -4,15 +4,15 @@ var Node = require("./node"),
 var Comment = function (value, isLineComment, index, currentFileInfo) {
     this.value = value;
     this.isLineComment = isLineComment;
-    this.index = index;
-    this.currentFileInfo = currentFileInfo;
+    this._index = index;
+    this._fileInfo = currentFileInfo;
     this.allowRoot = true;
 };
 Comment.prototype = new Node();
 Comment.prototype.type = "Comment";
 Comment.prototype.genCSS = function (context, output) {
     if (this.debugInfo) {
-        output.add(getDebugInfo(context, this), this.currentFileInfo, this.index);
+        output.add(getDebugInfo(context, this), this.fileInfo(), this.getIndex());
     }
     output.add(this.value);
 };

lib/less/tree/condition.js

@@ -4,7 +4,7 @@ var Condition = function (op, l, r, i, negate) {
     this.op = op.trim();
     this.lvalue = l;
     this.rvalue = r;
-    this.index = i;
+    this._index = i;
     this.negate = negate;
 };
 Condition.prototype = new Node();

lib/less/tree/declaration.js

@@ -7,12 +7,13 @@ var Declaration = function (name, value, important, merge, index, currentFileInf
     this.value = (value instanceof Node) ? value : new Value([value]); //value instanceof tree.Value || value instanceof tree.Ruleset ??
     this.important = important ? ' ' + important.trim() : '';
     this.merge = merge;
-    this.index = index;
-    this.currentFileInfo = currentFileInfo;
+    this._index = index;
+    this._fileInfo = currentFileInfo;
     this.inline = inline || false;
     this.variable = (variable !== undefined) ? variable
         : (name.charAt && (name.charAt(0) === '@'));
     this.allowRoot = true;
+    this.setParent(this.value, this);
 };
 
 function evalName(context, name) {
@@ -27,16 +28,16 @@ function evalName(context, name) {
 Declaration.prototype = new Node();
 Declaration.prototype.type = "Declaration";
 Declaration.prototype.genCSS = function (context, output) {
-    output.add(this.name + (context.compress ? ':' : ': '), this.currentFileInfo, this.index);
+    output.add(this.name + (context.compress ? ':' : ': '), this.fileInfo(), this.getIndex());
     try {
         this.value.genCSS(context, output);
     }
     catch(e) {
-        e.index = this.index;
-        e.filename = this.currentFileInfo.filename;
+        e.index = this._index;
+        e.filename = this._fileInfo.filename;
         throw e;
     }
-    output.add(this.important + ((this.inline || (context.lastRule && context.compress)) ? "" : ";"), this.currentFileInfo, this.index);
+    output.add(this.important + ((this.inline || (context.lastRule && context.compress)) ? "" : ";"), this._fileInfo, this._index);
 };
 Declaration.prototype.eval = function (context) {
     var strictMathBypass = false, name = this.name, evaldValue, variable = this.variable;
@@ -57,7 +58,7 @@ Declaration.prototype.eval = function (context) {
 
         if (!this.variable && evaldValue.type === "DetachedRuleset") {
             throw { message: "Rulesets cannot be evaluated on a property.",
-                    index: this.index, filename: this.currentFileInfo.filename };
+                    index: this.getIndex(), filename: this.fileInfo().filename };
         }
         var important = this.important,
             importantResult = context.importantScope.pop();
@@ -69,13 +70,13 @@ Declaration.prototype.eval = function (context) {
                           evaldValue,
                           important,
                           this.merge,
-                          this.index, this.currentFileInfo, this.inline,
+                          this.getIndex(), this.fileInfo(), this.inline,
                               variable);
     }
     catch(e) {
         if (typeof e.index !== 'number') {
-            e.index = this.index;
-            e.filename = this.currentFileInfo.filename;
+            e.index = this.getIndex();
+            e.filename = this.fileInfo().filename;
         }
         throw e;
     }
@@ -90,7 +91,7 @@ Declaration.prototype.makeImportant = function () {
                           this.value,
                           "!important",
                           this.merge,
-                          this.index, this.currentFileInfo, this.inline);
+                          this.getIndex(), this.fileInfo(), this.inline);
 };
 
 module.exports = Declaration;

lib/less/tree/detached-ruleset.js

@@ -1,9 +1,11 @@
 var Node = require("./node"),
-    contexts = require("../contexts");
+    contexts = require("../contexts"),
+    utils = require("../utils");
 
 var DetachedRuleset = function (ruleset, frames) {
     this.ruleset = ruleset;
     this.frames = frames;
+    this.setParent(this.ruleset, this);
 };
 DetachedRuleset.prototype = new Node();
 DetachedRuleset.prototype.type = "DetachedRuleset";
@@ -12,7 +14,7 @@ DetachedRuleset.prototype.accept = function (visitor) {
     this.ruleset = visitor.visit(this.ruleset);
 };
 DetachedRuleset.prototype.eval = function (context) {
-    var frames = this.frames || context.frames.slice(0);
+    var frames = this.frames || utils.copyArray(context.frames);
     return new DetachedRuleset(this.ruleset, frames);
 };
 DetachedRuleset.prototype.callEval = function (context) {