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.

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

Allow [] to resolve to last declaration's value #3256

Merged
merged 1 commit into from
Jul 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions lib/less/parser/parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ var Parser = function Parser(context, imports, fileInfo) {
parserInput.save();
args = null;
rule = this.lookupValue();
if (!rule) {
if (!rule && rule !== '') {
parserInput.restore();
break;
}
Expand All @@ -1141,14 +1141,14 @@ var Parser = function Parser(context, imports, fileInfo) {
return;
}

var name = parserInput.$re(/^(?:@{0,2}|\$)[_a-zA-Z0-9-]+/);
var name = parserInput.$re(/^(?:[@$]{0,2})[_a-zA-Z0-9-]*/);

if (!parserInput.$char(']')) {
parserInput.restore();
return;
}

if (name) {
if (name || name === '') {
parserInput.forget();
return name;
}
Expand Down
20 changes: 14 additions & 6 deletions lib/less/tree/namespace-value.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,24 @@ var NamespaceValue = function (ruleCall, lookups, important, index, fileInfo) {
NamespaceValue.prototype = new Node();
NamespaceValue.prototype.type = 'NamespaceValue';
NamespaceValue.prototype.eval = function (context) {
var i, j, name, found,
rules = this.value.eval(context);
var i, j, name, rules = this.value.eval(context);

for (i = 0; i < this.lookups.length; i++) {
name = this.lookups[i];

/**
* Eval'd DRs return rulesets.
* Eval'd mixins return rules, so let's make a ruleset if we need it.
* We need to do this because of late parsing of properties
* We need to do this because of late parsing of values
*/
if (Array.isArray(rules)) {
rules = new Ruleset([new Selector()], rules);
}

if (name.charAt(0) === '@') {
if (name === '') {
rules = rules.lastDeclaration();
}
else if (name.charAt(0) === '@') {
if (name.charAt(1) === '@') {
name = '@' + new Variable(name.substr(1)).eval(context).value;
}
Expand All @@ -44,13 +46,19 @@ NamespaceValue.prototype.eval = function (context) {
}
}
else {
if (name.substring(0, 2) === '$@') {
name = '$' + new Variable(name.substr(1)).eval(context).value;
}
else {
name = name.charAt(0) === '$' ? name : '$' + name;
}
if (rules.properties) {
rules = rules.property(name.charAt(0) === '$' ? name : '$' + name);
rules = rules.property(name);
}

if (!rules) {
throw { type: 'Name',
message: 'property "' + name + '" not found',
message: 'property "' + name.substr(1) + '" not found',
filename: this.fileInfo().filename,
index: this.getIndex() };
}
Expand Down
8 changes: 8 additions & 0 deletions lib/less/tree/ruleset.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,14 @@ Ruleset.prototype.property = function (name) {
return this.parseValue(decl);
}
};
Ruleset.prototype.lastDeclaration = function () {
for (var i = this.rules.length; i > 0; i--) {
var decl = this.rules[i - 1];
if (decl instanceof Declaration) {
return this.parseValue(decl);
}
}
};
Ruleset.prototype.parseValue = function(toParse) {
var self = this;
function transformDeclaration(decl) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions test/css/namespacing/namespacing-functions.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.foo {
width: 20px;
bar: val;
}
2 changes: 1 addition & 1 deletion test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ console.log('\n' + stylize('Less', 'underline') + '\n');

lessTester.prepBomTest();
var testMap = [
[{}, 'edge/'],
[{}, 'namespacing/'],
[{
strictMath: false,
relativeUrls: true,
Expand Down
11 changes: 11 additions & 0 deletions test/less/namespacing/namespacing-functions.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.add(@a, @b) {
@r: @a + @b;
}
.foo {
width: .add(10px, 10px)[];
bar: @return[];
}

@return: {
single: val;
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
keyword: small;
}

@media #ns.breakpoint(.valToGet[keyword])[@max] {
@media #ns.breakpoint(.valToGet[])[@max] {
.selector {
prop: val;
}
Expand Down