Skip to content

Commit 1efb2e3

Browse files
committed
Support sorting by at-rule parameter with argument
1 parent cce08bf commit 1efb2e3

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function getAtruleSortName(node, order) {
7979
var atruleName = '@' + node.name;
8080

8181
// If atRule has a parameter like @mixin name or @include name, sort by this parameter
82-
var atruleParameter = (/^[\w-]+/).exec(node.params);
82+
var atruleParameter = (/^[\w-\(\)]+/).exec(node.params);
8383

8484
if (atruleParameter && atruleParameter.length) {
8585
var sortNameExtended = atruleName + ' ' + atruleParameter[0];
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.block {
2+
@mixin clearfix;
3+
@include mwp(3);
4+
border: none;
5+
@include mwp(2);
6+
@include mwp(1);
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.block {
2+
@mixin clearfix;
3+
border: none;
4+
@include mwp(1);
5+
@include mwp(2);
6+
@include mwp(3);
7+
}

test/test.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,12 @@ test('Should sort at-rules by their parameter name', t => {
163163
] });
164164
});
165165

166+
test('Should sort at-rules by their parameter name and argument', t => {
167+
return run(t, 'at-rules-by-parameter-with-arg', { 'sort-order': [
168+
['@mixin', 'border', '@include mwp(1)', '@include mwp(2)', '@include mwp(3)']
169+
] });
170+
});
171+
166172
test('Should preserve indentation', t => {
167173
return run(t, 'indent', { 'sort-order': [
168174
['...'],

0 commit comments

Comments
 (0)