Skip to content

fix: mixin parameters with functions. fixes #122 #125

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

Merged
merged 2 commits into from
Nov 13, 2018
Merged

fix: mixin parameters with functions. fixes #122 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29528b6
fix: mixin parameters with functions. fixes #122
shellscape Nov 13, 2018
5a2bc2b
test: change new test name
shellscape Nov 13, 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
22 changes: 6 additions & 16 deletions lib/LessParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ module.exports = class LessParser extends Parser {
}

unknownWord(tokens) {
// NOTE: keep commented for examining unknown structures
// console.log('unknown', tokens);
// console.log(this.root.first);

const [first] = tokens;

// TODO: move this into a util function/file
Expand All @@ -92,7 +96,7 @@ module.exports = class LessParser extends Parser {
let important = '';

// fix for #86. if rulesets are mixin params, they need to be converted to a brackets token
if (bracketsIndex < 0 && firstParenIndex > 0) {
if ((bracketsIndex < 0 || bracketsIndex > 3) && firstParenIndex > 0) {
const lastParenIndex = tokens.findIndex((t) => t[0] === ')');

const contents = tokens.slice(firstParenIndex, lastParenIndex + firstParenIndex);
Expand Down Expand Up @@ -125,28 +129,14 @@ module.exports = class LessParser extends Parser {
this.lastNode.mixin = true;
this.lastNode.raws.identifier = identifier;

// const importantIndex = tokens.findIndex((t) => importantPattern.test(t[1]));

if (important) {
this.lastNode.important = true;
this.lastNode.raws.important = important;
}

// if (importantIndex > 0) {
// nodes.splice(importantIndex, 1);
// [this.lastNode.raws.important] = this.lastNode.params.match(importantPattern);

// this.lastNode.params = this.lastNode.params.replace(importantPattern, '');

// const [spaces] = this.lastNode.params.match(/\s+$/) || [''];
// this.lastNode.raws.between = spaces;
// this.lastNode.params = this.lastNode.params.trim();
// }

return;
}
// NOTE: keep commented for examining unknown structures
// console.log('unknown', tokens);

super.unknownWord(tokens);
}
};
16 changes: 16 additions & 0 deletions test/parser/mixins.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,3 +268,19 @@ test('important in parameters (#102)', (t) => {
t.falsy(first.important);
t.is(nodeToString(root), less);
});

test('mixin parameters with functions (#122)', (t) => {
const less = `.mixin({
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
});`;
const root = parse(less);
const { first } = root;

t.is(first.name, 'mixin');
t.is(nodeToString(root), less);
});