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.

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

Fix declaration-block-no-redundant-longhand-properties autofix for grid-column and grid-row #6957

Merged
merged 2 commits into from Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/wet-houses-warn.md
@@ -0,0 +1,5 @@
---
"stylelint": patch
---

Fixed: `declaration-block-no-redundant-longhand-properties` autofix for `grid-column` and `grid-row`
Expand Up @@ -206,6 +206,18 @@ testRule({
description: 'autofixer should not mangle css functions with comma separated values',
message: messages.expected('transition'),
},
{
code: 'a { grid-column-start: 1; grid-column-end: 2; }',
fixed: 'a { grid-column: 1 / 2; }',
description: 'explicit grid-column test',
message: messages.expected('grid-column'),
},
{
code: 'a { grid-row-start: 1; grid-row-end: 2; }',
fixed: 'a { grid-row: 1 / 2; }',
description: 'explicit grid-row test',
message: messages.expected('grid-row'),
},
{
code: 'a { border-top-left-radius: 1em; border-top-right-radius: 2em; border-bottom-right-radius: 3em; border-bottom-left-radius: 4em; }',
fixed: 'a { border-radius: 1em 2em 3em 4em; }',
Expand Down
Expand Up @@ -28,6 +28,28 @@ const meta = {

/** @type {Map<string, (decls: Map<string, Declaration>) => (string | undefined)>} */
const customResolvers = new Map([
[
'grid-column',
(decls) => {
const start = decls.get('grid-column-start')?.value.trim();
const end = decls.get('grid-column-end')?.value.trim();

if (!start || !end) return;

return `${start} / ${end}`;
},
],
[
'grid-row',
(decls) => {
const start = decls.get('grid-row-start')?.value.trim();
const end = decls.get('grid-row-end')?.value.trim();

if (!start || !end) return;

return `${start} / ${end}`;
},
],
[
'grid-template',
(decls) => {
Expand Down