Skip to content

Fix removing commas from function arguments in maps #14089

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
sosukesuzuki merged 15 commits into from
Jan 6, 2023
Merged

Fix removing commas from function arguments in maps #14089

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9c3c476
Fix in printer-side
Dec 30, 2022
bc3694f
Add tests
Dec 30, 2022
f9b4f64
Fix tests
Dec 30, 2022
fbd0ed2
Add changelog
Dec 30, 2022
8974873
Add comments
Dec 30, 2022
79c308c
Add comment
Dec 31, 2022
a0b061a
Address review
Jan 3, 2023
db6864a
Merge branch 'main' into fix-13984-2
Jan 3, 2023
0e044da
Merge branch 'main' into fix-13984-2
Jan 3, 2023
29842ce
Fix SCSSInterpolation detection
fisker Jan 3, 2023
2d213d1
Improve logic
fisker Jan 3, 2023
ae13eca
More tests
fisker Jan 3, 2023
7de4afa
Fix cases with multiple strings
fisker Jan 3, 2023
ef7d735
Merge branch 'main' into fix-13984-2
Jan 6, 2023
ee114cb
Revert change of `isSCSSMapItemNode`
Jan 6, 2023
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
Prev Previous commit
Next Next commit
Fix SCSSInterpolation detection
  • Loading branch information
@fisker
fisker committed Jan 3, 2023
commit 29842ce7f723a83f972648868d73cd383d0d0dce
24 changes: 2 additions & 22 deletions src/language-css/printer-postcss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,6 @@ function genericPrint(path, options, print) {
let insideSCSSInterpolationInString = false;
let didBreak = false;

const isMapItemNode = isSCSSMapItemNode(path);

for (let i = 0; i < node.groups.length; ++i) {
parts.push(printed[i]);

Expand Down Expand Up @@ -598,11 +596,11 @@ function genericPrint(path, options, print) {

// Ignore spaces before/after string interpolation (i.e. `"#{my-fn("_")}"`)
const isStartSCSSInterpolationInString =
iNode.type === "value-string" && iNode.value.startsWith("#{");
iNode.type === "value-string" && iNode.value.includes("#{");
const isEndingSCSSInterpolationInString =
insideSCSSInterpolationInString &&
iNextNode.type === "value-string" &&
iNextNode.value.endsWith("}");
iNextNode.value.includes("}");

if (
isStartSCSSInterpolationInString ||
Expand Down Expand Up @@ -860,24 +858,6 @@ function genericPrint(path, options, print) {
continue;
}

if (
isMapItemNode &&
node.groups?.[1]?.type === "value-colon" &&
i > 1 &&
// For example, there is the below key-value pair:
//
// "xs-only": "only screen and (max-width: #{map-get($grid-breakpoints, "sm")-1})"
//
// "only screen and (max-width: #{map-get($grid-breakpoints, " is a "value-string"
// and "sm" is a "value-word"
// We should not insert any spaces and lines here
((iNode.type === "value-string" &&
iNextNode?.type === "value-word") ||
(iNode.type === "value-word" && iPrevNode?.type === "value-string"))
) {
continue;
}

// Be default all values go through `line`
parts.push(line);
}
Expand Down