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

Fix declaration-block-no-duplicate-properties autofix for !important #6528

Merged
merged 5 commits into from Dec 23, 2022
Merged

Fix declaration-block-no-duplicate-properties autofix for !important #6528

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
3f2ab26
feat: add tests that fail
sidx1024 Dec 16, 2022
cefa3d4
feat: support handling !important
sidx1024 Dec 16, 2022
941dee5
test: add and handle additional cases
sidx1024 Dec 19, 2022
01b929e
Add changelog entry
ybiquitous Dec 20, 2022
c0f91b1
test: add missing test case
sidx1024 Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/rude-hornets-begin.md
View file
Open in desktop
@@ -0,0 +1,5 @@
---
"stylelint": patch
---

Fixed: `declaration-block-no-duplicate-properties` autofix for `!important`
51 changes: 51 additions & 0 deletions lib/rules/declaration-block-no-duplicate-properties/__tests__/index.js
View file
Open in desktop
Expand Up @@ -187,6 +187,24 @@ testRule({
endLine: 1,
endColumn: 55,
},
{
code: 'a { color: red !important; color: blue; }',
fixed: 'a { color: red !important; }',
message: messages.rejected('color'),
line: 1,
column: 28,
endLine: 1,
endColumn: 33,
},
{
code: 'a { color: red !important; color: blue !important; }',
fixed: 'a { color: blue !important; }',
message: messages.rejected('color'),
line: 1,
column: 28,
endLine: 1,
endColumn: 33,
},
],
});

Expand Down Expand Up @@ -231,6 +249,11 @@ testRule({
fixed: 'p { display: inline-block; font-weight: 400; font-size: 1rem; color: red; }',
message: messages.rejected('font-size'),
},
{
code: 'p { font-size: 16px !important; font-weight: 400; font-size: 1rem; }',
fixed: 'p { font-size: 16px !important; font-weight: 400; }',
message: messages.rejected('font-size'),
},
],
});

Expand All @@ -252,6 +275,16 @@ testRule({
fixed: 'p { font-size: 16px; font-weight: 400; }',
message: messages.rejected('font-size'),
},
{
code: 'p { font-size: 16px !important; font-weight: 400; font-size: 1rem; }',
fixed: 'p { font-size: 16px !important; font-weight: 400; }',
message: messages.rejected('font-size'),
},
{
code: 'p { font-size: 16px; font-size: 16px !important; font-weight: 400; }',
fixed: 'p { font-size: 16px !important; font-weight: 400; }',
message: messages.rejected('font-size'),
},
],
});

Expand Down Expand Up @@ -291,6 +324,16 @@ testRule({
fixed: 'p { width: -moz-fit-content; }',
message: messages.rejected('width'),
},
{
code: 'p { width: -moz-fit-content; width: -moz-fit-content !important; }',
fixed: 'p { width: -moz-fit-content !important; }',
message: messages.rejected('width'),
},
sidx1024 marked this conversation as resolved.
Show resolved Hide resolved
{
code: 'p { width: 100% !important; width: -moz-fit-content; }',
fixed: 'p { width: 100% !important; }',
message: messages.rejected('width'),
},
],
});

Expand All @@ -309,6 +352,9 @@ testRule({
{
code: 'p { color: pink; background: orange; color: orange }',
},
{
code: 'p { color: pink; color: orange !important; }',
},
],

reject: [
Expand All @@ -322,6 +368,11 @@ testRule({
fixed: 'p { color: pink; background: white; }',
message: messages.rejected('background'),
},
{
code: 'p { background: orange; color: pink; background: white !important; }',
fixed: 'p { color: pink; background: white !important; }',
message: messages.rejected('background'),
},
],
});

Expand Down
26 changes: 20 additions & 6 deletions lib/rules/declaration-block-no-duplicate-properties/index.js
View file
Open in desktop
Expand Up @@ -66,6 +66,7 @@ const rule = (primary, secondaryOptions, context) => {
const prop = decl.prop;
const lowerProp = decl.prop.toLowerCase();
const value = decl.value;
const important = decl.important;

if (!isStandardSyntaxProperty(prop)) {
return;
Expand All @@ -88,11 +89,19 @@ const rule = (primary, secondaryOptions, context) => {
const indexDuplicate = decls.findIndex((d) => d.prop.toLowerCase() === lowerProp);

if (indexDuplicate !== -1) {
const duplicateDecl = decls[indexDuplicate];
const duplicateValue = duplicateDecl ? duplicateDecl.value : '';
const duplicateImportant = duplicateDecl ? duplicateDecl.important : false;

if (ignoreDiffValues || ignorePrefixlessSameValues) {
// fails if duplicates are not consecutive
if (indexDuplicate !== decls.length - 1) {
if (context.fix) {
removePreviousDuplicate(decls, lowerProp);
if (!important && duplicateImportant) {
decl.remove();
} else {
removePreviousDuplicate(decls, lowerProp);
}

return;
}
Expand All @@ -108,14 +117,15 @@ const rule = (primary, secondaryOptions, context) => {
return;
}

const duplicateDecl = decls[indexDuplicate];
const duplicateValue = duplicateDecl ? duplicateDecl.value : '';

if (ignorePrefixlessSameValues) {
// fails if values of consecutive, unprefixed duplicates are equal
if (vendor.unprefixed(value) !== vendor.unprefixed(duplicateValue)) {
if (context.fix) {
removePreviousDuplicate(decls, lowerProp);
if (!important && duplicateImportant) {
decl.remove();
} else {
removePreviousDuplicate(decls, lowerProp);
}

return;
}
Expand Down Expand Up @@ -159,7 +169,11 @@ const rule = (primary, secondaryOptions, context) => {
}

if (context.fix) {
removePreviousDuplicate(decls, lowerProp);
if (!important && duplicateImportant) {
decl.remove();
} else {
removePreviousDuplicate(decls, lowerProp);
}

return;
}
Expand Down