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.

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(html): fix html configuration having no effect #5149

Merged
merged 1 commit into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/biome_html_formatter/tests/language.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl TestFormatLanguage for HtmlTestFormatLanguage {
let options = Self::ServiceLanguage::resolve_format_options(
Some(&settings.formatter),
Some(&settings.override_settings),
None,
Some(&settings.languages.html.formatter),
&BiomePath::new(""),
file_source,
);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed dapibus velit non justo tempus pretium. Praesent orci lorem, pellentesque sit amet ullamcorper sed, consectetur quis odio. In felis nulla, pellentesque a dolor eget, semper vestibulum nisi. Sed imperdiet dui a massa placerat ullamcorper. Praesent eleifend purus eget arcu faucibus, ac fringilla nulla aliquet. Aliquam id accumsan libero. Duis efficitur nisi quis massa mollis ultricies. Sed condimentum sit amet urna in cursus. Ut id tortor vestibulum, mollis enim sed, ornare ipsum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Ut nec dapibus est. Maecenas orci purus, blandit eu faucibus eu, lacinia id turpis.</span>
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
---
source: crates/biome_formatter_test/src/snapshot_builder.rs
info: elements/whitespace/ignore/long-content.html
---
# Input

```html
<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed dapibus velit non justo tempus pretium. Praesent orci lorem, pellentesque sit amet ullamcorper sed, consectetur quis odio. In felis nulla, pellentesque a dolor eget, semper vestibulum nisi. Sed imperdiet dui a massa placerat ullamcorper. Praesent eleifend purus eget arcu faucibus, ac fringilla nulla aliquet. Aliquam id accumsan libero. Duis efficitur nisi quis massa mollis ultricies. Sed condimentum sit amet urna in cursus. Ut id tortor vestibulum, mollis enim sed, ornare ipsum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Ut nec dapibus est. Maecenas orci purus, blandit eu faucibus eu, lacinia id turpis.</span>

```


=============================

# Outputs

## Output 1

-----
Indent style: Tab
Indent width: 2
Line ending: LF
Line width: 80
Attribute Position: Auto
Bracket same line: false
Whitespace sensitivity: css
Indent script and style: false
-----

```html
<span
>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed dapibus velit
non justo tempus pretium. Praesent orci lorem, pellentesque sit amet
ullamcorper sed, consectetur quis odio. In felis nulla, pellentesque a dolor
eget, semper vestibulum nisi. Sed imperdiet dui a massa placerat ullamcorper.
Praesent eleifend purus eget arcu faucibus, ac fringilla nulla aliquet.
Aliquam id accumsan libero. Duis efficitur nisi quis massa mollis ultricies.
Sed condimentum sit amet urna in cursus. Ut id tortor vestibulum, mollis enim
sed, ornare ipsum. Class aptent taciti sociosqu ad litora torquent per conubia
nostra, per inceptos himenaeos. Ut nec dapibus est. Maecenas orci purus,
blandit eu faucibus eu, lacinia id turpis.</span
>
```

## Output 1

-----
Indent style: Tab
Indent width: 2
Line ending: LF
Line width: 80
Attribute Position: Auto
Bracket same line: false
Whitespace sensitivity: ignore
Indent script and style: false
-----

```html
<span>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed dapibus velit non
justo tempus pretium. Praesent orci lorem, pellentesque sit amet ullamcorper
sed, consectetur quis odio. In felis nulla, pellentesque a dolor eget, semper
vestibulum nisi. Sed imperdiet dui a massa placerat ullamcorper. Praesent
eleifend purus eget arcu faucibus, ac fringilla nulla aliquet. Aliquam id
accumsan libero. Duis efficitur nisi quis massa mollis ultricies. Sed
condimentum sit amet urna in cursus. Ut id tortor vestibulum, mollis enim sed,
ornare ipsum. Class aptent taciti sociosqu ad litora torquent per conubia
nostra, per inceptos himenaeos. Ut nec dapibus est. Maecenas orci purus,
blandit eu faucibus eu, lacinia id turpis.
</span>
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"$schema": "../../../../../../../packages/@biomejs/biome/configuration_schema.json",
"html": {
"formatter": {
"whitespaceSensitivity": "ignore"
}
}
}
9 changes: 3 additions & 6 deletions crates/biome_service/src/file_handlers/html.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,15 @@ pub struct HtmlFormatterSettings {
impl From<HtmlFormatterConfiguration> for HtmlFormatterSettings {
fn from(config: HtmlFormatterConfiguration) -> Self {
HtmlFormatterSettings {
// TODO
// uncomment once ready
// bracket_same_line: config.bracket_same_line,
// whitespace_sensitivity: config.whitespace_sensitivity,
// indent_script_and_style: config.indent_script_and_style,
enabled: config.enabled,
line_ending: config.line_ending,
line_width: config.line_width,
indent_width: config.indent_width,
indent_style: config.indent_style,
attribute_position: config.attribute_position,
..Default::default()
bracket_same_line: config.bracket_same_line,
whitespace_sensitivity: config.whitespace_sensitivity,
indent_script_and_style: config.indent_script_and_style,
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions crates/biome_service/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ impl Settings {
if let Some(graphql) = configuration.graphql {
self.languages.graphql = graphql.into()
}
// html settings
if let Some(html) = configuration.html {
self.languages.html = html.into()
}

// NOTE: keep this last. Computing the overrides require reading the settings computed by the parent settings.
if let Some(overrides) = configuration.overrides {
Expand Down
Loading