Merge pull request #2785 from less/root-functions

Allows root (non-value) functions in Less

Author: matthew-dean

.travis.yml

@@ -4,6 +4,11 @@ node_js:
   - "4.0.0"
   - "0.12"
   - "0.10"
+before_install:
+  - mkdir travis-phantomjs
+  - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
 install:
   - npm install -g grunt-cli
   - npm install

lib/less/parser/parser.js

@@ -261,7 +261,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }
 
                     node = mixin.definition() || this.rule() || this.ruleset() ||
-                        mixin.call() || this.rulesetCall() || this.directive();
+                        mixin.call() || this.rulesetCall() || this.entities.call() || this.directive();
                     if (node) {
                         root.push(node);
                     } else {
@@ -370,19 +370,51 @@ var Parser = function Parser(context, imports, fileInfo) {
                     return new(tree.Call)(name, args, index, fileInfo);
                 },
                 arguments: function () {
-                    var args = [], arg;
+                    var argsSemiColon = [], argsComma = [],
+                        expressions = [],
+                        isSemiColonSeparated, value, arg;
+
+                    parserInput.save();
 
                     while (true) {
-                        arg = this.assignment() || parsers.expression();
+
+                        arg = parsers.detachedRuleset() || this.assignment() || parsers.expression();
+
                         if (!arg) {
                             break;
                         }
-                        args.push(arg);
-                        if (! parserInput.$char(',')) {
-                            break;
+
+                        value = arg;
+
+                        if (arg.value && arg.value.length == 1) {
+                            value = arg.value[0];
+                        }
+
+                        if (value) {
+                            expressions.push(value);
+                        }
+
+                        argsComma.push(value);
+
+                        if (parserInput.$char(',')) {
+                            continue;
+                        }
+
+                        if (parserInput.$char(';') || isSemiColonSeparated) {
+
+                            isSemiColonSeparated = true;
+
+                            if (expressions.length > 1) {
+                                value = new(tree.Value)(expressions);
+                            }
+                            argsSemiColon.push(value);
+
+                            expressions = [];
                         }
                     }
-                    return args;
+
+                    parserInput.forget();
+                    return isSemiColonSeparated ? argsSemiColon : argsComma;
                 },
                 literal: function () {
                     return this.dimension() ||

lib/less/tree/anonymous.js

@@ -6,7 +6,7 @@ var Anonymous = function (value, index, currentFileInfo, mapLines, rulesetLike,
     this.mapLines = mapLines;
     this.currentFileInfo = currentFileInfo;
     this.rulesetLike = (typeof rulesetLike === 'undefined') ? false : rulesetLike;
-
+    this.allowRoot = true;
     this.copyVisibilityInfo(visibilityInfo);
 };
 Anonymous.prototype = new Node();

lib/less/tree/call.js

@@ -31,18 +31,21 @@ 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);
 
-    if (funcCaller.isValid()) { // 1.
+    if (funcCaller.isValid()) {
         try {
             result = funcCaller.call(args);
-            if (result != null) {
-                return result;
-            }
         } catch (e) {
             throw { type: e.type || "Runtime",
                     message: "error evaluating function `" + this.name + "`" +
                              (e.message ? ': ' + e.message : ''),
                     index: this.index, filename: this.currentFileInfo.filename };
         }
+
+        if (result != null) {
+            result.index = this.index;
+            result.currentFileInfo = this.currentFileInfo;
+            return result;
+        }
     }
 
     return new Call(this.name, args, this.index, this.currentFileInfo);

lib/less/tree/comment.js

@@ -5,6 +5,7 @@ var Comment = function (value, isLineComment, index, currentFileInfo) {
     this.value = value;
     this.isLineComment = isLineComment;
     this.currentFileInfo = currentFileInfo;
+    this.allowRoot = true;
 };
 Comment.prototype = new Node();
 Comment.prototype.type = "Comment";

lib/less/tree/directive.js

@@ -23,6 +23,7 @@ var Directive = function (name, value, rules, index, currentFileInfo, debugInfo,
     this.debugInfo = debugInfo;
     this.isRooted = isRooted || false;
     this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
 };
 
 Directive.prototype = new Node();

lib/less/tree/extend.js

@@ -9,6 +9,7 @@ var Extend = function Extend(selector, option, index, currentFileInfo, visibilit
     this.parent_ids = [this.object_id];
     this.currentFileInfo = currentFileInfo || {};
     this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
 
     switch(option) {
         case "all":

lib/less/tree/import.js

@@ -23,6 +23,7 @@ var Import = function (path, features, options, index, currentFileInfo, visibili
     this.path = path;
     this.features = features;
     this.currentFileInfo = currentFileInfo;
+    this.allowRoot = true;
 
     if (this.options.less !== undefined || this.options.inline) {
         this.css = !this.options.less || this.options.inline;

lib/less/tree/media.js

@@ -15,6 +15,7 @@ var Media = function (value, features, index, currentFileInfo, visibilityInfo) {
     this.rules = [new Ruleset(selectors, value)];
     this.rules[0].allowImports = true;
     this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
 };
 Media.prototype = new Directive();
 Media.prototype.type = "Media";

lib/less/tree/mixin-call.js

@@ -9,6 +9,7 @@ var MixinCall = function (elements, args, index, currentFileInfo, important) {
     this.index = index;
     this.currentFileInfo = currentFileInfo;
     this.important = important;
+    this.allowRoot = true;
 };
 MixinCall.prototype = new Node();
 MixinCall.prototype.type = "MixinCall";

lib/less/tree/mixin-definition.js

@@ -27,6 +27,7 @@ var Definition = function (name, params, rules, condition, variadic, frames, vis
     this.optionalParameters = optionalParameters;
     this.frames = frames;
     this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
 };
 Definition.prototype = new Ruleset();
 Definition.prototype.type = "MixinDefinition";

lib/less/tree/rule.js

@@ -12,6 +12,7 @@ var Rule = function (name, value, important, merge, index, currentFileInfo, inli
     this.inline = inline || false;
     this.variable = (variable !== undefined) ? variable
         : (name.charAt && (name.charAt(0) === '@'));
+    this.allowRoot = true;
 };
 
 function evalName(context, name) {

lib/less/tree/ruleset-call.js

@@ -3,6 +3,7 @@ var Node = require("./node"),
 
 var RulesetCall = function (variable) {
     this.variable = variable;
+    this.allowRoot = true;
 };
 RulesetCall.prototype = new Node();
 RulesetCall.prototype.type = "RulesetCall";

lib/less/tree/ruleset.js

@@ -14,6 +14,7 @@ var Ruleset = function (selectors, rules, strictImports, visibilityInfo) {
     this._lookups = {};
     this.strictImports = strictImports;
     this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
 };
 Ruleset.prototype = new Node();
 Ruleset.prototype.type = "Ruleset";

lib/less/visitors/to-css-visitor.js

@@ -199,23 +199,34 @@ ToCSSVisitor.prototype = {
         return directiveNode;
     },
 
-    checkPropertiesInRoot: function(rules) {
-        var ruleNode;
+    checkValidNodes: function(rules, isRoot) {
+        if (!rules) {
+            return;
+        }
+
         for (var i = 0; i < rules.length; i++) {
-            ruleNode = rules[i];
-            if (ruleNode instanceof tree.Rule && !ruleNode.variable) {
-                throw { message: "properties must be inside selector blocks, they cannot be in the root.",
-                    index: ruleNode.index, filename: ruleNode.currentFileInfo ? ruleNode.currentFileInfo.filename : null};
+            var ruleNode = rules[i];
+            if (isRoot && ruleNode instanceof tree.Rule && !ruleNode.variable) {
+                throw { message: "Properties must be inside selector blocks. They cannot be in the root",
+                    index: ruleNode.index, filename: ruleNode.currentFileInfo && ruleNode.currentFileInfo.filename};
+            }
+            if (ruleNode instanceof tree.Call) {
+                throw { message: "Function '" + ruleNode.name + "' is undefined",
+                    index: ruleNode.index, filename: ruleNode.currentFileInfo && ruleNode.currentFileInfo.filename};
+            }
+            if (!ruleNode.allowRoot) {
+                throw { message: ruleNode.type + " node returned by a function is not valid here",
+                    index: ruleNode.index, filename: ruleNode.currentFileInfo && ruleNode.currentFileInfo.filename};
             }
         }
     },
 
     visitRuleset: function (rulesetNode, visitArgs) {
         //at this point rulesets are nested into each other
         var rule, rulesets = [];
-        if (rulesetNode.firstRoot) {
-            this.checkPropertiesInRoot(rulesetNode.rules);
-        }
+
+        this.checkValidNodes(rulesetNode.rules, rulesetNode.firstRoot);
+
         if (! rulesetNode.root) {
             //remove invisible paths
             this._compileRulesetPaths(rulesetNode);

test/css/plugin.css

@@ -1,3 +1,4 @@
+@charset "utf-8";
 .other {
   trans: transitive;
 }
@@ -42,3 +43,7 @@
     result: local;
   }
 }
+.root {
+  prop: value;
+}
+@arbitrary value after ();

test/less/errors/detached-ruleset-3.txt

@@ -1,4 +1,4 @@
-SyntaxError: properties must be inside selector blocks, they cannot be in the root. in {path}detached-ruleset-3.less on line 2, column 3:
+SyntaxError: Properties must be inside selector blocks. They cannot be in the root in {path}detached-ruleset-3.less on line 2, column 3:
 1 @a: {
 2   b: 1;
 3 };

test/less/errors/functions-1.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-undefined();

test/less/errors/functions-1.txt

@@ -0,0 +1,3 @@
+SyntaxError: Function 'test-undefined' is undefined in {path}functions-1.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-undefined();

test/less/errors/functions-10-keyword.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-keyword();

test/less/errors/functions-10-keyword.txt

@@ -0,0 +1,3 @@
+SyntaxError: Keyword node returned by a function is not valid here in {path}functions-10-keyword.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-keyword();

test/less/errors/functions-11-operation.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-operation();

test/less/errors/functions-11-operation.txt

@@ -0,0 +1,3 @@
+SyntaxError: Operation node returned by a function is not valid here in {path}functions-11-operation.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-operation();

test/less/errors/functions-12-quoted.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-quoted();

test/less/errors/functions-12-quoted.txt

@@ -0,0 +1,3 @@
+SyntaxError: Quoted node returned by a function is not valid here in {path}functions-12-quoted.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-quoted();

test/less/errors/functions-13-selector.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-selector();

test/less/errors/functions-13-selector.txt

@@ -0,0 +1,3 @@
+SyntaxError: Selector node returned by a function is not valid here in {path}functions-13-selector.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-selector();

test/less/errors/functions-14-url.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-url();

test/less/errors/functions-14-url.txt

@@ -0,0 +1,3 @@
+SyntaxError: Url node returned by a function is not valid here in {path}functions-14-url.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-url();

test/less/errors/functions-15-value.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-value();

test/less/errors/functions-15-value.txt

@@ -0,0 +1,3 @@
+SyntaxError: Value node returned by a function is not valid here in {path}functions-15-value.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-value();

test/less/errors/functions-2-alpha.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-alpha();

test/less/errors/functions-2-alpha.txt

@@ -0,0 +1,3 @@
+SyntaxError: Alpha node returned by a function is not valid here in {path}functions-2-alpha.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-alpha();

test/less/errors/functions-3-assignment.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-assignment();

test/less/errors/functions-3-assignment.txt

@@ -0,0 +1,3 @@
+SyntaxError: Assignment node returned by a function is not valid here in {path}functions-3-assignment.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-assignment();

test/less/errors/functions-4-call.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-call();

test/less/errors/functions-4-call.txt

@@ -0,0 +1,3 @@
+SyntaxError: Function 'foo' is undefined in {path}functions-4-call.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-call();

test/less/errors/functions-5-color-2.less

@@ -0,0 +1 @@
+rgba(0,0,0,0);

test/less/errors/functions-5-color-2.txt

@@ -0,0 +1,2 @@
+SyntaxError: Color node returned by a function is not valid here in {path}functions-5-color-2.less on line 1, column 1:
+1 rgba(0,0,0,0);

test/less/errors/functions-5-color.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-color();

test/less/errors/functions-5-color.txt

@@ -0,0 +1,3 @@
+SyntaxError: Color node returned by a function is not valid here in {path}functions-5-color.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-color();

test/less/errors/functions-6-condition.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-condition();

test/less/errors/functions-6-condition.txt

@@ -0,0 +1,3 @@
+SyntaxError: Condition node returned by a function is not valid here in {path}functions-6-condition.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-condition();

test/less/errors/functions-7-dimension.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-dimension();

test/less/errors/functions-7-dimension.txt

@@ -0,0 +1,3 @@
+SyntaxError: Dimension node returned by a function is not valid here in {path}functions-7-dimension.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-dimension();

test/less/errors/functions-8-element.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-element();

test/less/errors/functions-8-element.txt

@@ -0,0 +1,3 @@
+SyntaxError: Element node returned by a function is not valid here in {path}functions-8-element.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-element();

test/less/errors/functions-9-expression.less

@@ -0,0 +1,2 @@
+@plugin "../plugin/plugin-tree-nodes";
+test-expression();

test/less/errors/functions-9-expression.txt

@@ -0,0 +1,3 @@
+SyntaxError: Expression node returned by a function is not valid here in {path}functions-9-expression.less on line 2, column 1:
+1 @plugin "../plugin/plugin-tree-nodes";
+2 test-expression();

test/less/errors/property-in-root.txt

@@ -1,4 +1,4 @@
-SyntaxError: properties must be inside selector blocks, they cannot be in the root. in {path}property-in-root.less on line 2, column 3:
+SyntaxError: Properties must be inside selector blocks. They cannot be in the root in {path}property-in-root.less on line 2, column 3:
 1 .a() {
 2   prop:1;
 3 }

test/less/errors/property-in-root2.txt

@@ -1,4 +1,4 @@
-SyntaxError: properties must be inside selector blocks, they cannot be in the root. in {path}property-in-root.less on line 2, column 3:
+SyntaxError: Properties must be inside selector blocks. They cannot be in the root in {path}property-in-root.less on line 2, column 3:
 1 .a() {
 2   prop:1;
 3 }

test/less/errors/property-in-root3.txt

@@ -1,3 +1,3 @@
-SyntaxError: properties must be inside selector blocks, they cannot be in the root. in {path}property-in-root3.less on line 1, column 1:
+SyntaxError: Properties must be inside selector blocks. They cannot be in the root in {path}property-in-root3.less on line 1, column 1:
 1 prop:1;
 2 .a {