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 removing commas from function arguments in maps #14089
Merged
Merged
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
9c3c476
Fix in printer-side
sosukesuzuki bc3694f
Add tests
sosukesuzuki f9b4f64
Fix tests
sosukesuzuki fbd0ed2
Add changelog
sosukesuzuki 8974873
Add comments
sosukesuzuki 79c308c
Add comment
sosukesuzuki a0b061a
Address review
sosukesuzuki db6864a
Merge branch 'main' into fix-13984-2
sosukesuzuki 0e044da
Merge branch 'main' into fix-13984-2
sosukesuzuki 29842ce
Fix SCSSInterpolation detection
fisker 2d213d1
Improve logic
fisker ae13eca
More tests
fisker 7de4afa
Fix cases with multiple strings
fisker ef7d735
Merge branch 'main' into fix-13984-2
sosukesuzuki ee114cb
Revert change of `isSCSSMapItemNode`
sosukesuzuki File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#### Fix removing commas from function arguments in maps (#14089 by @sosukesuzuki) | ||
|
||
<!-- prettier-ignore --> | ||
```scss | ||
/* Input */ | ||
$foo: map-fn( | ||
( | ||
"#{prop}": inner-fn($first, $second), | ||
) | ||
); | ||
|
||
/* Prettier stable */ | ||
$foo: map-fn(("#{prop}": inner-fn($first $second))); | ||
|
||
/* Prettier main */ | ||
$foo: map-fn( | ||
( | ||
"#{prop}": inner-fn($first, $second), | ||
) | ||
); | ||
|
||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
tests/format/scss/map/function-argument/__snapshots__/jsfmt.spec.js.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
tests/format/scss/map/function-argument/function-argument-2.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
$display-breakpoints: map-deep-merge( | ||
( | ||
"sm-only": "only screen and (min-width: #{$map-get + $grid-breakpoints + "hogehoge"}) and (max-width: #{$a})", | ||
"sm-only": "inside a long long long long long long long long long long long long long long string #{call("")}", | ||
"sm-only": "inside a long long long long long long long long long long long long long long string #{$foo} and #{call("")}", | ||
"sm-only": "inside a long long long long long long long long long long long long long long string #{call($a)}", | ||
), | ||
$display-breakpoints | ||
); | ||
|
||
@each $name, $hue in $hues { | ||
$map: map.merge( | ||
$map, | ||
( | ||
'#{$prefix}-#{$name}': blend.set($base, $hue: $hue), | ||
) | ||
); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we revert this line?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you! ee114cb