testea/test-repo
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SCSS compound comparison line breaks (#19687)

Browse Source 
Co-authored-by: fisker Cheung <lionkay@gmail.com>
Signed-off-by: Aland <158173939+aland-omed@users.noreply.github.com>
This commit is contained in:
Alandandfisker Cheung authored and GitHub committed 2026-07-22 09:46:33 +08:00
1 parent ea8167fcca
commit 8e05b371ab
4 files changed
+43 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

changelog_unreleased/scss/19687.md
+19
View File
@@ -0,0 +1,19 @@
#### Keep compound comparisons together (#19687 by @aland-omed)
<!-- prettier-ignore -->
```scss
// Input
@if $something == $something-else and $another-thing == $another-thing-with-long-name {}
// Prettier stable
@if $something ==
$something-else and
$another-thing ==
$another-thing-with-long-name
{}
// Prettier main
@if $something == $something-else and
$another-thing == $another-thing-with-long-name
{}
```
src/language-css/print/comma-separated-value-group.js
+4
View File
@@ -67,6 +67,8 @@ function printCommaSeparatedValueGroup(path, options, print) {
const isControlDirective =
atRuleAncestorNode &&
isSCSSControlDirectiveNode(atRuleAncestorNode, options);
const hasLogicalOperator =
isControlDirective && node.groups.some(isIfElseKeywordNode);
const hasInlineComment = node.groups.some((node) =>
isInlineValueCommentNode(node),
);
@@ -422,6 +424,8 @@ function printCommaSeparatedValueGroup(path, options, print) {
isControlDirective &&
(isEqualityOperatorNode(iNextNode) ||
isRelationalOperatorNode(iNextNode) ||
(hasLogicalOperator &&
(isEqualityOperatorNode(iNode) || isRelationalOperatorNode(iNode))) ||
isIfElseKeywordNode(iNextNode) ||
isEachKeywordNode(iNode) ||
isForKeywordNode(iNode))
tests/format/scss/atrule/__snapshots__/format.test.js.snap
+19 -28
View File
@@ -557,6 +557,7 @@ p {
@if $very-very-very-long-var == 0 and $very-very-very-long-var == 0 {}
@if $very-very-very-very-very-very-long-var == 0 and $very-very-very-long-var == 0 {}
@if $very-very-very-very-very-very-very-very-very-very-very-long-var == 0 and $very-very-very-very-very-very-very-very-very-very-very-long-var == 0 {}
@if $something == $something-else and $another-thing == $another-thing-with-long-name {}
@if $base-font-size != 16px or $base-line-height != 24px or $base-unit != 'em' or $h1-font-size != 2 * $base-font-size or $h2-font-size != 1.5 * $base-font-size or $h3-font-size != 1.17 * $base-font-size or $h4-font-size != 1 * $base-font-size or $h5-font-size != 0.83 * $base-font-size or $h6-font-size != 0.67 * $base-font-size or $indent-amount != 40px {}
@if (str-slice($item, 0, 1) == ":") {}
@if (str-slice($item, 0, 3) == " : ") {}
@@ -645,44 +646,34 @@ p {
}
@if $very-very-very-long-var == 0 and $very-very-very-long-var == 0 {
}
@if $very-very-very-very-very-very-long-var ==
0 and
$very-very-very-long-var ==
0
@if $very-very-very-very-very-very-long-var == 0 and
$very-very-very-long-var == 0
{
}
@if $very-very-very-very-very-very-very-very-very-very-very-long-var ==
0 and
$very-very-very-very-very-very-very-very-very-very-very-long-var ==
0
@if $very-very-very-very-very-very-very-very-very-very-very-long-var == 0 and
$very-very-very-very-very-very-very-very-very-very-very-long-var == 0
{
}
@if $base-font-size !=
16px or
$base-line-height !=
24px or
$base-unit !=
"em" or
$h1-font-size !=
2 *
@if $something == $something-else and
$another-thing == $another-thing-with-long-name
{
}
@if $base-font-size != 16px or
$base-line-height != 24px or
$base-unit != "em" or
$h1-font-size != 2 *
$base-font-size or
$h2-font-size !=
1.5 *
$h2-font-size != 1.5 *
$base-font-size or
$h3-font-size !=
1.17 *
$h3-font-size != 1.17 *
$base-font-size or
$h4-font-size !=
1 *
$h4-font-size != 1 *
$base-font-size or
$h5-font-size !=
0.83 *
$h5-font-size != 0.83 *
$base-font-size or
$h6-font-size !=
0.67 *
$h6-font-size != 0.67 *
$base-font-size or
$indent-amount !=
40px
$indent-amount != 40px
{
}
@if (str-slice($item, 0, 1) == ":") {
tests/format/scss/atrule/if-else.scss
+1
View File
@@ -138,6 +138,7 @@ p {
@if $very-very-very-long-var == 0 and $very-very-very-long-var == 0 {}
@if $very-very-very-very-very-very-long-var == 0 and $very-very-very-long-var == 0 {}
@if $very-very-very-very-very-very-very-very-very-very-very-long-var == 0 and $very-very-very-very-very-very-very-very-very-very-very-long-var == 0 {}
@if $something == $something-else and $another-thing == $another-thing-with-long-name {}
@if $base-font-size != 16px or $base-line-height != 24px or $base-unit != 'em' or $h1-font-size != 2 * $base-font-size or $h2-font-size != 1.5 * $base-font-size or $h3-font-size != 1.17 * $base-font-size or $h4-font-size != 1 * $base-font-size or $h5-font-size != 0.83 * $base-font-size or $h6-font-size != 0.67 * $base-font-size or $indent-amount != 40px {}
@if (str-slice($item, 0, 1) == ":") {}
@if (str-slice($item, 0, 3) == " : ") {}