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

Removes "double paren" issue for boolean / if function #3259

Merged
merged 5 commits into from
Jul 10, 2018
Merged

Removes "double paren" issue for boolean / if function #3259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c542b5
Removes "double paren" issue for boolean / if function
matthew-dean Jul 4, 2018
a58e871
Allows plain conditions without parentheses
matthew-dean Jul 4, 2018
5aeb6c0
Merge branch 'master' into bugfix-boolean-if
matthew-dean Jul 8, 2018
dfba629
Makes sure this doesn't regress needing parens around mixin guard con…
matthew-dean Jul 8, 2018
ea8a4f2
Workaround weird Jasmine conversion of < to HTML entity
matthew-dean Jul 8, 2018
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
46 changes: 26 additions & 20 deletions lib/less/parser/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,16 @@ var Parser = function Parser(context, imports, fileInfo) {
);
}

function expect(arg, msg, index) {
function expect(arg, msg) {
// some older browsers return typeof 'function' for RegExp
var result = (arg instanceof Function) ? arg.call(parsers) : parserInput.$re(arg);
if (result) {
return result;
}
error(msg || (typeof arg === 'string' ? 'expected \'' + arg + '\' got \'' + parserInput.currentChar() + '\''
: 'unexpected token'));

error(msg || (typeof arg === 'string'
? 'expected \'' + arg + '\' got \'' + parserInput.currentChar() + '\''
: 'unexpected token'));
}

// Specialization of expect()
Expand Down Expand Up @@ -1963,13 +1965,13 @@ var Parser = function Parser(context, imports, fileInfo) {
conditions: function () {
var a, b, index = parserInput.i, condition;

a = this.condition();
a = this.condition(true);
if (a) {
while (true) {
if (!parserInput.peek(/^,\s*(not\s*)?\(/) || !parserInput.$char(',')) {
break;
}
b = this.condition();
b = this.condition(true);
if (!b) {
break;
}
Expand All @@ -1978,19 +1980,19 @@ var Parser = function Parser(context, imports, fileInfo) {
return condition || a;
}
},
condition: function () {
condition: function (needsParens) {
var result, logical, next;
function or() {
return parserInput.$str('or');
}

result = this.conditionAnd(this);
result = this.conditionAnd(needsParens);
if (!result) {
return ;
}
logical = or();
if (logical) {
next = this.condition();
next = this.condition(needsParens);
if (next) {
result = new(tree.Condition)(logical, result, next);
} else {
Expand All @@ -1999,22 +2001,26 @@ var Parser = function Parser(context, imports, fileInfo) {
}
return result;
},
conditionAnd: function () {
var result, logical, next;
function insideCondition(me) {
return me.negatedCondition() || me.parenthesisCondition();
conditionAnd: function (needsParens) {
var result, logical, next, self = this;
function insideCondition() {
var cond = self.negatedCondition(needsParens) || self.parenthesisCondition(needsParens);
if (!cond && !needsParens) {
return self.atomicCondition(needsParens);
}
return cond;
}
function and() {
return parserInput.$str('and');
}

result = insideCondition(this);
result = insideCondition();
if (!result) {
return ;
}
logical = and();
if (logical) {
next = this.conditionAnd();
next = this.conditionAnd(needsParens);
if (next) {
result = new(tree.Condition)(logical, result, next);
} else {
Expand All @@ -2023,20 +2029,20 @@ var Parser = function Parser(context, imports, fileInfo) {
}
return result;
},
negatedCondition: function () {
negatedCondition: function (needsParens) {
if (parserInput.$str('not')) {
var result = this.parenthesisCondition();
var result = this.parenthesisCondition(needsParens);
if (result) {
result.negate = !result.negate;
}
return result;
}
},
parenthesisCondition: function () {
parenthesisCondition: function (needsParens) {
function tryConditionFollowedByParenthesis(me) {
var body;
parserInput.save();
body = me.condition();
body = me.condition(needsParens);
if (!body) {
parserInput.restore();
return ;
Expand All @@ -2061,7 +2067,7 @@ var Parser = function Parser(context, imports, fileInfo) {
return body;
}

body = this.atomicCondition();
body = this.atomicCondition(needsParens);
if (!body) {
parserInput.restore();
return ;
Expand All @@ -2073,7 +2079,7 @@ var Parser = function Parser(context, imports, fileInfo) {
parserInput.forget();
return body;
},
atomicCondition: function () {
atomicCondition: function (needsParens) {
var entities = this.entities, index = parserInput.i, a, b, c, op;

function cond() {
Expand Down
5 changes: 5 additions & 0 deletions test/css/functions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,5 +222,10 @@ html {
c: 3;
e: ;
f: 6;
g: 3;
h: 5;
i: 6;
j: 8;
k: 1;
/* results in void */
}
5 changes: 5 additions & 0 deletions test/less/errors/mixins-guards-cond-expected.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.max (@a, @b) when @a {
width: @b;
}

.max1 { .max(3, 6) }
3 changes: 3 additions & 0 deletions test/less/errors/mixins-guards-cond-expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SyntaxError: expected condition in {path}mixins-guards-cond-expected.less on line 1, column 20:
1 .max (@a, @b) when @a {
2 width: @b;
11 changes: 8 additions & 3 deletions test/less/functions.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ html {
#boolean {
a: boolean(not(2 < 1));
b: boolean(not(2 > 1) and (true));
c: boolean(not(boolean((true))));
c: boolean(not(boolean(true)));
}

#if {
Expand All @@ -255,8 +255,13 @@ html {
@1: if(not(false), {c: 3}, {d: 4}); @1();

e: if(not(true), 5);
@f: boolean((3 = 4));
@f: boolean(3 = 4);
f: if(not(@f), 6);
g: if(true, 3, 5);
h: if(false, 3, 5);
i: if(true and isnumber(6), 6, 8);
j: if(not(true) and true, 6, 8);
k: if(true or true, 1);

if((false), {g: 7}); /* results in void */
if(false, {g: 7}); /* results in void */
}