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

Stop inserting space in LESS property access #14103

Merged
merged 8 commits into from Jan 7, 2023
Merged

Stop inserting space in LESS property access #14103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
70f97d3
Stop inserting space in LESS variable property access
fisker Jan 3, 2023
b467fbf
More test
fisker Jan 3, 2023
f472913
Fix
fisker Jan 3, 2023
a055d93
Fix comment
fisker Jan 3, 2023
cbda451
Fix changelog
fisker Jan 3, 2023
63829cc
Fix AST_COMPARE test
fisker Jan 3, 2023
7df90a5
Fix
fisker Jan 3, 2023
69db73f
Use `node.type` instead of `typeof`
fisker Jan 3, 2023
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
17 changes: 17 additions & 0 deletions changelog_unreleased/less/14103.md
View file
Open in desktop
@@ -0,0 +1,17 @@
#### Do not insert space in LESS property access (#14103 by @fisker)

<!-- prettier-ignore -->
```less
// Input
a {
color: @colors[@white];
}

// Prettier stable
a {
color: @colors[ @white];
}

// Prettier main
<Same as input>
```
21 changes: 21 additions & 0 deletions src/language-css/clean.js
View file
Open in desktop
Expand Up @@ -183,6 +183,27 @@ function clean(ast, newObj, parent) {
});
}
}

// We parse `@var[ foo ]` and `@var[foo]` differently
if (
ast.type === "value-comma_group" &&
ast.groups.some(
(node) =>
(node.type === "value-atword" && node.value.endsWith("[")) ||
(node.type === "value-word" && node.value.startsWith("]"))
)
) {
return {
type: "value-atword",
value: ast.groups.map((node) => node.value).join(""),
group: {
open: null,
close: null,
groups: [],
type: "value-paren_group",
},
};
}
}

clean.ignoredProperties = ignoredProperties;
Expand Down
21 changes: 20 additions & 1 deletion src/language-css/printer-postcss.js
View file
Open in desktop
Expand Up @@ -620,7 +620,26 @@ function genericPrint(path, options, print) {
}

// Ignore `@` in Less (i.e. `@@var;`)
if (iNode.type === "value-atword" && iNode.value === "") {
if (
iNode.type === "value-atword" &&
(iNode.value === "" ||
/*
@var[ @notVarNested ][notVar]
^^^^^
*/
iNode.value.endsWith("["))
) {
continue;
}

/*
@var[ @notVarNested ][notVar]
^^^^^^^^^
*/
if (
iNextNode.type === "value-word" &&
iNextNode.value.startsWith("]")
) {
continue;
}

Expand Down
22 changes: 17 additions & 5 deletions tests/format/less/case/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
Expand Up @@ -389,9 +389,15 @@ printWidth: 80
canChangeCase: @var[@notVarNested][notVar];
canChangeCase: @var[ @notVarNested][notVar];
canChangeCase: @var[@notVarNested ][notVar];
canChangeCase: @var[ @notVarNested ][notVar];
canChangeCase: @var[@notVarNested][notVar];
canChangeCase: @var[@notVarNested][ notVar];
canChangeCase: @var[@notVarNested][notVar ];
canChangeCase: @var[@notVarNested][ notVar ];
canChangeCase: @var[notVar];
canChangeCase: @var[ notVar];
canChangeCase: @var[notVar ];
canChangeCase: @var[ notVar ];
}

=====================================output=====================================
Expand Down Expand Up @@ -453,11 +459,17 @@ printWidth: 80
};

@not-var {
canchangecase: @var[ @notVarNested][notVar];
canchangecase: @var[ @notVarNested][notVar];
canchangecase: @var[ @notVarNested ][notVar];
canchangecase: @var[ @notVarNested][ notVar];
canchangecase: @var[ @notVarNested][notVar ];
canchangecase: @var[@notVarNested][notVar];
canchangecase: @var[@notVarNested][notVar];
canchangecase: @var[@notVarNested][notVar];
canchangecase: @var[@notVarNested][notVar];
canchangecase: @var[@notVarNested][notVar];
canchangecase: @var[@notVarNested][notVar];
canchangecase: @var[@notVarNested][notVar];
canchangecase: @var[@notVarNested][notVar];
canchangecase: @var[notVar];
canchangecase: @var[notVar];
canchangecase: @var[notVar];
canchangecase: @var[notVar];
}

Expand Down
6 changes: 6 additions & 0 deletions tests/format/less/case/variable.less
View file
Open in desktop
Expand Up @@ -59,7 +59,13 @@
canChangeCase: @var[@notVarNested][notVar];
canChangeCase: @var[ @notVarNested][notVar];
canChangeCase: @var[@notVarNested ][notVar];
canChangeCase: @var[ @notVarNested ][notVar];
canChangeCase: @var[@notVarNested][notVar];
canChangeCase: @var[@notVarNested][ notVar];
canChangeCase: @var[@notVarNested][notVar ];
canChangeCase: @var[@notVarNested][ notVar ];
canChangeCase: @var[notVar];
canChangeCase: @var[ notVar];
canChangeCase: @var[notVar ];
canChangeCase: @var[ notVar ];
}