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

Improved multiple default() guards conflict detection. #1823

Merged
merged 1 commit into from
Jan 22, 2014
Merged

Improved multiple default() guards conflict detection. #1823

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
53 changes: 26 additions & 27 deletions lib/less/tree/mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ tree.mixin.Call.prototype = {
}
},
eval: function (env) {
var mixins, mixin, args, rules = [], match = false, i, m, f, isRecursive, isOneFound, rule;
var candidates = [], candidate, conditionResult = [], defaultFunc = tree.defaultFunc, defaultUsed = false;
var mixins, mixin, args, rules = [], match = false, i, m, f, isRecursive, isOneFound, rule,
candidates = [], candidate, conditionResult = [], defaultFunc = tree.defaultFunc,
defaultResult, defNone = 0, defTrue = 1, defFalse = 2, count;

args = this.arguments && this.arguments.map(function (a) {
return { name: a.name, value: a.value.eval(env) };
Expand Down Expand Up @@ -49,7 +50,7 @@ tree.mixin.Call.prototype = {
}

if (mixin.matchArgs(args, env)) {
candidate = {mixin: mixin};
candidate = {mixin: mixin, group: defNone};

if (mixin.matchCondition) {
for (f = 0; f < 2; f++) {
Expand All @@ -58,20 +59,8 @@ tree.mixin.Call.prototype = {
}
if (conditionResult[0] || conditionResult[1]) {
if (conditionResult[0] != conditionResult[1]) {
if (defaultUsed) {
// todo: ideally, it would make sense to also print the candidate
// mixin definitions that cause the conflict (current one and the
// mixin that set defaultUsed flag). But is there any easy method
// to get their filename/line/index info here?
throw { type: 'Runtime',
message: 'Ambiguous use of `default()` found when matching for `'
+ this.format(args) + '`',
index: this.index, filename: this.currentFileInfo.filename };
}

defaultUsed = true;
candidate.matchIfDefault = true;
candidate.matchIfDefaultValue = conditionResult[1];
candidate.group = conditionResult[1]
? defTrue : defFalse;
}

candidates.push(candidate);
Expand All @@ -86,25 +75,35 @@ tree.mixin.Call.prototype = {
}

defaultFunc.reset();

count = [0, 0, 0];
for (m = 0; m < candidates.length; m++) {
count[candidates[m].group]++;
}

if (count[defNone] > 0) {
defaultResult = defFalse;
} else {
defaultResult = defTrue;
if ((count[defTrue] + count[defFalse]) > 1) {
throw { type: 'Runtime',
message: 'Ambiguous use of `default()` found when matching for `'
+ this.format(args) + '`',
index: this.index, filename: this.currentFileInfo.filename };
}
}

for (m = 0; m < candidates.length; m++) {
candidate = candidates[m];
if (!candidate.matchIfDefault || (candidate.matchIfDefaultValue == (candidates.length == 1))) {
candidate = candidates[m].group;
if ((candidate === defNone) || (candidate === defaultResult)) {
try {
mixin = candidate.mixin;
mixin = candidates[m].mixin;
if (!(mixin instanceof tree.mixin.Definition)) {
mixin = new tree.mixin.Definition("", [], mixin.rules, null, false);
mixin.originalRuleset = mixins[m].originalRuleset || mixins[m];
}
//if (this.important) {
// isImportant = env.isImportant;
// env.isImportant = true;
//}
Array.prototype.push.apply(
rules, mixin.eval(env, args, this.important).rules);
//if (this.important) {
// env.isImportant = isImportant;
//}
} catch (e) {
throw { message: e.message, index: this.index, filename: this.currentFileInfo.filename, stack: e.stack };
}
Expand Down
9 changes: 9 additions & 0 deletions test/css/mixins-guards-default-func.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@ guard-default-multi-4 {
always: 2;
case: 2;
}
guard-default-not-ambiguos-2 {
case: 1;
not-default: 2;
}
guard-default-not-ambiguos-3 {
case: 1;
not-default-1: 2;
not-default-2: 2;
}
guard-default-scopes-3 {
3: when default;
}
Expand Down
2 changes: 1 addition & 1 deletion test/less/errors/mixins-guards-default-func-1.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

guard-default-func-conflict {
.m(@x, @y) {}
.m(@x, 1) {}
.m(@x, 2) when (default()) {}
.m(@x, 2) when (default()) {}

Expand Down
9 changes: 9 additions & 0 deletions test/less/errors/mixins-guards-default-func-3.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

guard-default-func-conflict {
.m(1) {}
.m(@x) when not(default()) {}
.m(@x) when not(default()) {}

.m(1);
.m(2);
}
4 changes: 4 additions & 0 deletions test/less/errors/mixins-guards-default-func-3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
RuntimeError: Ambiguous use of `default()` found when matching for `.m(2)` in {path}mixins-guards-default-func-3.less on line 8, column 5:
7 .m(1);
8 .m(2);
9 }
28 changes: 22 additions & 6 deletions test/less/mixins-guards-default-func.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,18 +117,18 @@ guard-default-expr-never {
// not conflicting multiple default() uses:

guard-default-multi-1 {
.m(0) {case: 0}
.m(@x) when (default()) {default-1: @x}
.m(2) when (default()) {default-2: @x}
.m(0) {case: 0}
.m(@x) when (default()) {default-1: @x}
.m(2) when (default()) {default-2: @x}

&-0 {.m(0)}
&-1 {.m(1)}
}

guard-default-multi-2 {
.m(1, @x) when (default()) {default-1: @x}
.m(2, @x) when (default()) {default-2: @x}
.m(@x, yes) when (default()) {default-3: @x}
.m(1, @x) when (default()) {default-1: @x}
.m(2, @x) when (default()) {default-2: @x}
.m(@x, yes) when (default()) {default-3: @x}

&-1 {.m(1, no)}
&-2 {.m(2, no)}
Expand Down Expand Up @@ -158,6 +158,22 @@ guard-default-multi-4 {
.m(2);
}

guard-default-not-ambiguos-2 {
.m(@x) {case: 1}
.m(@x) when (default()) {default: @x}
.m(@x) when not(default()) {not-default: @x}

.m(2);
}

guard-default-not-ambiguos-3 {
.m(@x) {case: 1}
.m(@x) when not(default()) {not-default-1: @x}
.m(@x) when not(default()) {not-default-2: @x}

.m(2);
}

// default & scope

guard-default-scopes {
Expand Down