Skip to content

Commit

Permalink
at-rule-conditional-no-parentheses: remove extra autofix space (#969)
Browse files Browse the repository at this point in the history
Co-authored-by: Krister Kari <musky_heating0p@icloud.com>
  • Loading branch information
kristerkari and kristerkari committed Mar 2, 2024
1 parent 51935cc commit 1620f10
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 0 deletions.
43 changes: 43 additions & 0 deletions src/rules/at-rule-conditional-no-parentheses/__tests__/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ testRule({
message: messages.rejected,
description: "does not accept @if with parentheses"
},
{
code: "@if (true) {}",
fixed: "@if true {}",
line: 1,
column: 5,
endLine: 1,
endColumn: 11,
message: messages.rejected,
description: "fixes @if correctly, issue #887"
},
{
code: "@while(true) {}",
fixed: "@while true {}",
Expand All @@ -82,6 +92,16 @@ testRule({
message: messages.rejected,
description: "does not accept @while with parentheses"
},
{
code: "@while (true) {}",
fixed: "@while true {}",
line: 1,
column: 8,
endLine: 1,
endColumn: 14,
message: messages.rejected,
description: "fixes @while correctly, issue #887"
},
{
code: `@if true {}
@else if(true) {}`,
Expand All @@ -93,6 +113,29 @@ testRule({
endLine: 2,
endColumn: 21,
description: "does not accept @else if with parentheses"
},
{
code: `@if(true) {}
@else if(true) {}`,
fixed: `@if true {}
@else if true {}`,
warnings: [
{
message: messages.rejected,
line: 1,
column: 4,
endLine: 1,
endColumn: 10
},
{
message: messages.rejected,
line: 2,
column: 15,
endLine: 2,
endColumn: 21
}
],
description: "fixes @else if correctly, issue #887"
}
]
});
4 changes: 4 additions & 0 deletions src/rules/at-rule-conditional-no-parentheses/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ function fix(atrule) {
// 2 regex groups: 'if ' and cond.
const groups = atrule.params.match(regex).slice(1);

if (atrule.name !== "else") {
atrule.raws.afterName = "";
}

atrule.params = [...new Set(groups)].join(" ");
}

Expand Down

0 comments on commit 1620f10

Please sign in to comment.