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 shorthand-property-no-redundant-values false negatives for functions #7657

Merged
merged 7 commits into from Apr 27, 2024
Merged

Fix shorthand-property-no-redundant-values false negatives for functions #7657

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
000f631
Fix `shorthand-property-no-redundant-values` false negatives for func…
ybiquitous Apr 26, 2024
f6cf12b
Apply suggestion for readability
ybiquitous Apr 26, 2024
7739172
build
ybiquitous Apr 26, 2024
47ddc79
Add test case for `border-radius` with `/`
ybiquitous Apr 26, 2024
7ab186d
Exclude `var()` support
ybiquitous Apr 26, 2024
101003d
Refactor to use `return` instead of `break` in loop
ybiquitous Apr 27, 2024
b290aee
Refactor to rename `isShorthandProperty` to `isSupportedShorthand`
ybiquitous Apr 27, 2024
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
11 changes: 4 additions & 7 deletions lib/rules/shorthand-property-no-redundant-values/__tests__/index.mjs
View file
Open in desktop
Expand Up @@ -85,6 +85,10 @@ testRule({
code: 'a { border-radius: 1px 1px / 1px; }',
description: 'ignore ellipse',
},
{
code: 'a { margin: var(--margin) var(--margin); }',
description: 'ignore variables',
},
{
code: 'a { border-color: #FFFFFF transparent transparent; }',
description: 'ignore upper case value',
Expand Down Expand Up @@ -373,13 +377,6 @@ testRule({
line: 1,
column: 5,
},
{
code: 'a { margin: var(--margin) var(--margin); }',
fixed: 'a { margin: var(--margin); }',
message: messages.rejected('var(--margin) var(--margin)', 'var(--margin)'),
line: 1,
column: 5,
},
{
code: 'a { margin: calc(1px + 1px) calc(1px + 1px); }',
fixed: 'a { margin: calc(1px + 1px); }',
Expand Down
10 changes: 10 additions & 0 deletions lib/rules/shorthand-property-no-redundant-values/index.cjs
View file
Open in desktop
Expand Up @@ -140,6 +140,16 @@ const rule = (primary, _secondaryOptions, context) => {
break;
}

// `var()` should be ignored. E.g.
//
// --padding: 20px 5px;
// padding: 0 var(--padding) 0;
//
if (typeGuards.isValueFunction(valueNode) && valueNode.value.toLowerCase() === 'var') {
shouldIgnore = true;
break;
}

if (typeGuards.isValueWord(valueNode) || typeGuards.isValueFunction(valueNode)) {
valuesToShorthand.push(valueParser.stringify(valueNode));
}
Expand Down
10 changes: 10 additions & 0 deletions lib/rules/shorthand-property-no-redundant-values/index.mjs
View file
Open in desktop
Expand Up @@ -138,6 +138,16 @@ const rule = (primary, _secondaryOptions, context) => {
break;
}

// `var()` should be ignored. E.g.
//
// --padding: 20px 5px;
// padding: 0 var(--padding) 0;
//
if (isValueFunction(valueNode) && valueNode.value.toLowerCase() === 'var') {
shouldIgnore = true;
break;
}
ybiquitous marked this conversation as resolved.
Show resolved Hide resolved

if (isValueWord(valueNode) || isValueFunction(valueNode)) {
valuesToShorthand.push(valueParser.stringify(valueNode));
}
Expand Down