Skip to content

Fix edge cases with whitespace in enforces-shorthand #308

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
francoismassart merged 2 commits into from
Jan 17, 2024
Merged

Fix edge cases with whitespace in enforces-shorthand #308

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
0d2d29c
Add test cases (one is broken)
kachkaev Jan 15, 2024
aff977b
Fix
kachkaev Jan 15, 2024
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
2 changes: 1 addition & 1 deletion lib/rules/enforces-shorthand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ module.exports = {
const w = whitespaces[i] ?? '';
const cls = union[i];
validatedClassNamesValue += headSpace ? `${w}${cls}` : isLast ? `${cls}` : `${cls}${w}`;
if (headSpace && tailSpace && isLast) {
if (tailSpace && isLast) {
validatedClassNamesValue += whitespaces[whitespaces.length - 1] ?? '';
}
}
Expand Down
20 changes: 20 additions & 0 deletions tests/lib/rules/enforces-shorthand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,26 @@ ruleTester.run("shorthands", rule, {
`,
errors: [generateError(["overflow-hidden", "text-ellipsis", "whitespace-nowrap"], "truncate")],
},
{
code: "<div className={ctl(`${live && 'bg-white'} w-full px-10 py-10`)}>Leading space trim issue with fix</div>",
output: "<div className={ctl(`${live && 'bg-white'} w-full p-10`)}>Leading space trim issue with fix</div>",
errors: [generateError(["px-10", "py-10"], "p-10")],
},
{
code: "<div className={ctl(`${live && 'bg-white'} w-full px-10 py-10 `)}>Leading space trim issue with fix (2)</div>",
output: "<div className={ctl(`${live && 'bg-white'} w-full p-10 `)}>Leading space trim issue with fix (2)</div>",
errors: [generateError(["px-10", "py-10"], "p-10")],
},
{
code: "<div className={ctl(`w-full px-10 py-10 ${live && 'bg-white'}`)}>Trailing space trim issue with fix</div>",
output: "<div className={ctl(`w-full p-10 ${live && 'bg-white'}`)}>Trailing space trim issue with fix</div>",
Copy link
Contributor Author

@kachkaev kachkaev Jan 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Observed output before the fix:

Suggested change
output: "<div className={ctl(`w-full p-10 ${live && 'bg-white'}`)}>Trailing space trim issue with fix</div>",
output: "<div className={ctl(`w-full p-10${live && 'bg-white'}`)}>Trailing space trim issue with fix</div>",

errors: [generateError(["px-10", "py-10"], "p-10")],
},
{
code: "<div className={ctl(` w-full px-10 py-10 ${live && 'bg-white'}`)}>Trailing space trim issue with fix (2)</div>",
output: "<div className={ctl(` w-full p-10 ${live && 'bg-white'}`)}>Trailing space trim issue with fix (2)</div>",
errors: [generateError(["px-10", "py-10"], "p-10")],
},
{
code: `<div class="h-10 w-10">New size-* utilities</div>`,
output: `<div class="size-10">New size-* utilities</div>`,
Expand Down