fix(biome_css_formatter): update css format style #4476
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 |
|---|---|---|
|
|
@@ -12,6 +12,45 @@ impl FormatNodeRule<CssGenericProperty> for FormatCssGenericProperty { | |
| value, | ||
| } = node.as_fields(); | ||
|
|
||
| let is_dash_identity = name.clone().unwrap().as_css_dashed_identifier().is_some(); | ||
|
|
||
| let has_comma = value.iter().any(|v| v.text().eq(",")); | ||
|
There was a problem hiding this comment. Checking for a comma ( You can use the playground to surgically understand how to query it: https://biomejs.dev/playground/?lintRules=all&files.main.css=aAB0AG0AbAAgAHsACgAJAGYAbwBuAHQALQBmAGEAbQBpAGwAeQA6ACAAcwB5AHMAdABlAG0ALQB1AGkALAAgAC0AYQBwAHAAbABlAC0AcwB5AHMAdABlAG0AOwAKAH0A (Click on the comma on the left side, and it should point to the relative node on the right, in the syntax tab) |
||
|
|
||
| if has_comma && !is_dash_identity { | ||
| write!( | ||
| f, | ||
| [ | ||
| name.format(), | ||
| colon_token.format(), | ||
| indent(&format_with(|f| { | ||
| let last = value.last().unwrap(); | ||
|
|
||
|
|
||
| for (idx, v) in value.iter().enumerate() { | ||
| if idx == 0 { | ||
| write!(f, [soft_line_break_or_space()])?; | ||
| } | ||
|
|
||
| if v.text().eq(",") { | ||
| write!(f, [v.format(), hard_line_break()])?; | ||
| } else if let Some(next) = value.iter().nth(idx + 1) { | ||
| if next.text().eq(",") || v == last { | ||
| write!(f, [v.format()])?; | ||
| } else { | ||
| write!(f, [v.format(), space()])?; | ||
| } | ||
| } else { | ||
| write!(f, [v.format()])?; | ||
| } | ||
| } | ||
|
Comment on lines
+28
to
+44
There was a problem hiding this comment. I am not really sure I understand what's happening here, so I am waiting for your to update the PR description and explain how the algorithm works. |
||
|
|
||
| Ok(()) | ||
| })), | ||
| ] | ||
| )?; | ||
|
|
||
| return Ok(()); | ||
| } | ||
|
|
||
| write!( | ||
| f, | ||
| [name.format(), colon_token.format(), space(), value.format()] | ||
|
|
||
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
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
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,15 @@ | ||
| html { | ||
| font-family: system-ui, -apple-system; | ||
| } | ||
|
|
||
| body { | ||
| font-family: sans-serif, serif, system-ui; | ||
| } | ||
|
|
||
| div { | ||
| font-family: system-ui; | ||
| } | ||
|
|
||
| div { | ||
| box-shadow: 10px 10px 10px 10px rgb(10 18 30 / 12%), 12px 10px 10px 10px rgb(10 18 30 / 16%); | ||
| } |
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,65 @@ | ||
| --- | ||
| source: crates/biome_formatter_test/src/snapshot_builder.rs | ||
| assertion_line: 212 | ||
| info: css/properties/long_values.css | ||
| --- | ||
| # Input | ||
|
|
||
| ```css | ||
| html { | ||
| font-family: system-ui, -apple-system; | ||
| } | ||
|
|
||
| body { | ||
| font-family: sans-serif, serif, system-ui; | ||
| } | ||
|
|
||
| div { | ||
| font-family: system-ui; | ||
| } | ||
|
|
||
| div { | ||
| box-shadow: 10px 10px 10px 10px rgb(10 18 30 / 12%), 12px 10px 10px 10px rgb(10 18 30 / 16%); | ||
| } | ||
|
|
||
| ``` | ||
|
|
||
|
|
||
| ============================= | ||
|
|
||
| # Outputs | ||
|
|
||
| ## Output 1 | ||
|
|
||
| ----- | ||
| Indent style: Tab | ||
| Indent width: 2 | ||
| Line ending: LF | ||
| Line width: 80 | ||
| Quote style: Double Quotes | ||
| ----- | ||
|
|
||
| ```css | ||
| html { | ||
| font-family: | ||
| system-ui, | ||
| -apple-system; | ||
| } | ||
|
|
||
| body { | ||
| font-family: | ||
| sans-serif, | ||
| serif, | ||
| system-ui; | ||
| } | ||
|
|
||
| div { | ||
| font-family: system-ui; | ||
| } | ||
|
|
||
| div { | ||
| box-shadow: | ||
| 10px 10px 10px 10px rgb(10 18 30 / 12%), | ||
| 12px 10px 10px 10px rgb(10 18 30 / 16%); | ||
| } | ||
| ``` |
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
Oops, something went wrong.
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.
Don't use
unwrap(); you rarely need to use this method because it panics at runtime. In your case you can useCssDashedIdentifer::can_cast(name.syntax().kind());