Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for variables in certain at-rules. #1860

Merged
merged 1 commit into from
Feb 11, 2014
Merged

Support for variables in certain at-rules. #1860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 35 additions & 23 deletions lib/less/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,7 +1662,7 @@ less.Parser = function Parser(env) {
//
directive: function () {
var index = i, name, value, rules, nonVendorSpecificName,
hasBlock, hasIdentifier, hasExpression, identifier;
hasIdentifier, hasExpression, hasUnknown, hasBlock = true;

if (input.charAt(i) !== '@') { return; }

Expand All @@ -1683,9 +1683,8 @@ less.Parser = function Parser(env) {
}

switch(nonVendorSpecificName) {
/*
case "@font-face":
hasBlock = true;
break;
case "@viewport":
case "@top-left":
case "@top-left-corner":
Expand All @@ -1705,42 +1704,55 @@ less.Parser = function Parser(env) {
case "@right-bottom":
hasBlock = true;
break;
case "@host":
case "@page":
case "@document":
case "@supports":
case "@keyframes":
hasBlock = true;
*/
case "@charset":
hasIdentifier = true;
hasBlock = false;
break;
case "@namespace":
hasExpression = true;
hasBlock = false;
break;
case "@keyframes":
hasIdentifier = true;
break;
case "@host":
case "@page":
case "@document":
case "@supports":
hasUnknown = true;
break;
}

if (hasIdentifier) {
identifier = ($re(/^[^{]+/) || '').trim();
if (identifier) {
name += " " + identifier;
value = this.entity();
if (!value) {
error("expected " + name + " identifier");
}
} else if (hasExpression) {
value = this.expression();
if (!value) {
error("expected " + name + " expression");
}
} else if (hasUnknown) {
value = ($re(/^[^{;]+/) || '').trim();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

; has to be in the regex otherwise we have the following issue (1.6.3):

@supports magic;

.mixin {
    color: grey;
}

div {
    .mixin; // Err, not found because it was parsed as a part of the directive: `@supports magic;\n.mixin {...}`
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good spot

if (value) {
value = new(tree.Anonymous)(value);
}
}

if (hasBlock) {
rules = this.block();
if (rules) {
return new(tree.Directive)(name, rules, index, env.currentFileInfo);
}
} else {
value = hasExpression ? this.expression() : this.entity();
if (value && $char(';')) {
var directive = new(tree.Directive)(name, value, index, env.currentFileInfo);
if (env.dumpLineNumbers) {
directive.debugInfo = getDebugInfo(i, input, env);
}
return directive;
if (rules) {
rules = new(tree.Ruleset)(null, rules);
}
}

if (rules || (!hasBlock && value && $char(';'))) {
return new(tree.Directive)(name, value, rules, index, env.currentFileInfo,
env.dumpLineNumbers ? getDebugInfo(index, input, env) : null);
}

restore();
},

Expand Down
62 changes: 33 additions & 29 deletions lib/less/tree/directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,62 @@
(function (tree) {

tree.Directive = function (name, value, index, currentFileInfo) {
this.name = name;

if (Array.isArray(value)) {
this.rules = [new(tree.Ruleset)(null, value)];
this.rules[0].allowImports = true;
} else {
this.value = value;
tree.Directive = function (name, value, rules, index, currentFileInfo, debugInfo) {
this.name = name;
this.value = value;
if (rules) {
this.rules = rules;
this.rules.allowImports = true;
}
this.index = index;
this.currentFileInfo = currentFileInfo;

this.debugInfo = debugInfo;
};

tree.Directive.prototype = {
type: "Directive",
accept: function (visitor) {
if (this.rules) {
this.rules = visitor.visitArray(this.rules);
var value = this.value, rules = this.rules;
if (rules) {
rules = visitor.visit(rules);
}
if (this.value) {
this.value = visitor.visit(this.value);
if (value) {
value = visitor.visit(value);
}
},
genCSS: function (env, output) {
var value = this.value, rules = this.rules;
output.add(this.name, this.currentFileInfo, this.index);
if (this.rules) {
tree.outputRuleset(env, output, this.rules);
} else {
if (value) {
output.add(' ');
this.value.genCSS(env, output);
value.genCSS(env, output);
}
if (rules) {
tree.outputRuleset(env, output, [rules]);
} else {
output.add(';');
}
},
toCSS: tree.toCSS,
eval: function (env) {
var evaldDirective = this;
if (this.rules) {
env.frames.unshift(this);
evaldDirective = new(tree.Directive)(this.name, null, this.index, this.currentFileInfo);
evaldDirective.rules = [this.rules[0].eval(env)];
evaldDirective.rules[0].root = true;
env.frames.shift();
var value = this.value, rules = this.rules;
if (value) {
value = value.eval(env);
}
if (rules) {
rules = rules.eval(env);
rules.root = true;
}
return evaldDirective;
return new(tree.Directive)(this.name, value, rules,
this.index, this.currentFileInfo, this.debugInfo);
},
variable: function (name) { return tree.Ruleset.prototype.variable.call(this.rules[0], name); },
find: function () { return tree.Ruleset.prototype.find.apply(this.rules[0], arguments); },
rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.rules[0]); },
variable: function (name) { if (this.rules) return tree.Ruleset.prototype.variable.call(this.rules, name); },
find: function () { if (this.rules) return tree.Ruleset.prototype.find.apply(this.rules, arguments); },
rulesets: function () { if (this.rules) return tree.Ruleset.prototype.rulesets.apply(this.rules); },
markReferenced: function () {
var i, rules;
this.isReferenced = true;
if (this.rules) {
rules = this.rules[0].rules;
rules = this.rules.rules;
for (i = 0; i < rules.length; i++) {
if (rules[i].markReferenced) {
rules[i].markReferenced();
Expand Down
4 changes: 2 additions & 2 deletions test/css/debug/linenumbers-all.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@charset "UTF-8";
/* line 3, {pathimport}test.less */
@media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\000033}}
/* line 1, {pathimport}test.less */
@media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\000031}}
/* @charset "ISO-8859-1"; */
/* line 23, {pathimport}test.less */
@media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\0000323}}
Expand Down
2 changes: 1 addition & 1 deletion test/css/debug/linenumbers-comments.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@charset "UTF-8";
/* line 3, {pathimport}test.less */
/* line 1, {pathimport}test.less */
/* @charset "ISO-8859-1"; */
/* line 23, {pathimport}test.less */
.tst3 {
Expand Down
2 changes: 1 addition & 1 deletion test/css/debug/linenumbers-mediaquery.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@charset "UTF-8";
@media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\000033}}
@media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\000031}}
/* @charset "ISO-8859-1"; */
@media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\0000323}}
.tst3 {
Expand Down
18 changes: 18 additions & 0 deletions test/css/variables-in-at-rules.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@charset "UTF-8";
@namespace less "http://lesscss.org";
@keyframes enlarger {
from {
font-size: 12px;
}
to {
font-size: 15px;
}
}
@-webkit-keyframes reducer {
from {
font-size: 13px;
}
to {
font-size: 10px;
}
}
4 changes: 4 additions & 0 deletions test/less/errors/at-rules-undefined-var.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

@keyframes @name {
50% {width: 20px;}
}
4 changes: 4 additions & 0 deletions test/less/errors/at-rules-undefined-var.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
NameError: variable @name is undefined in {path}at-rules-undefined-var.less on line 2, column 12:
1
2 @keyframes @name {
3 50% {width: 20px;}
20 changes: 20 additions & 0 deletions test/less/variables-in-at-rules.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

@Eight: 8;
@charset "UTF-@{Eight}";

@ns: less;
@namespace @ns "http://lesscss.org";

@name: enlarger;
@keyframes @name {
from {font-size: 12px;}
to {font-size: 15px;}
}

.m(reducer);
.m(@name) {
@-webkit-keyframes @name {
from {font-size: 13px;}
to {font-size: 10px;}
}
}