biomejs · dyc3 · Feb 3, 2025 · Feb 2, 2025
diff --git a/crates/biome_html_formatter/src/context.rs b/crates/biome_html_formatter/src/context.rs
@@ -245,7 +245,11 @@ impl FormatOptions for HtmlFormatOptions {
 )]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub enum WhitespaceSensitivity {
-    /// Leading and trailing whitespace in content is considered significant for inline elements.
+    /// The formatter considers whitespace significant for elements that have an "inline" display style by default in
+    /// browser's user agent style sheets.
+    #[default]
+    Css,
+    /// Leading and trailing whitespace in content is considered significant for all elements.
     ///
     /// The formatter should leave at least one whitespace character if whitespace is present.
     /// Otherwise, if there is no whitespace, it should not add any after `>` or before `<`. In other words, if there's no whitespace, the text content should hug the tags.
@@ -256,7 +260,6 @@ pub enum WhitespaceSensitivity {
     ///     >content</b
     /// >
     /// ```
-    #[default]
     Strict,
     /// Whitespace is considered insignificant. The formatter is free to remove or add whitespace as it sees fit.
     Ignore,
@@ -265,6 +268,7 @@ pub enum WhitespaceSensitivity {
 impl fmt::Display for WhitespaceSensitivity {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
+            Self::Css => std::write!(f, "css"),
             Self::Strict => std::write!(f, "strict"),
             Self::Ignore => std::write!(f, "ignore"),
         }
@@ -276,14 +280,19 @@ impl FromStr for WhitespaceSensitivity {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
+            "css" => Ok(Self::Css),
             "strict" => Ok(Self::Strict),
             "ignore" => Ok(Self::Ignore),
-            _ => Err("Value not supported for WhitespaceSensitivity. Supported values are 'strict' and 'ignore'."),
+            _ => Err("Value not supported for WhitespaceSensitivity. Supported values are 'css', 'strict' and 'ignore'."),
         }
     }
 }
 
 impl WhitespaceSensitivity {
+    pub const fn is_css(&self) -> bool {
+        matches!(self, Self::Css)
+    }
+
     pub const fn is_strict(&self) -> bool {
         matches!(self, Self::Strict)
     }

diff --git a/crates/biome_html_formatter/src/html/auxiliary/element.rs b/crates/biome_html_formatter/src/html/auxiliary/element.rs
@@ -46,6 +46,8 @@ impl FormatNodeRule<HtmlElement> for FormatHtmlElement {
                 .as_ref()
                 .is_some_and(|tag_name| tag_name.text().eq_ignore_ascii_case(tag))
         });
+        let is_whitespace_sensitive = whitespace_sensitivity.is_strict()
+            || (whitespace_sensitivity.is_css() && is_inline_tag);
 
         let content_has_leading_whitespace = children
             .syntax()
@@ -85,14 +87,10 @@ impl FormatNodeRule<HtmlElement> for FormatHtmlElement {
         // to borrow, while the child formatters are responsible for actually printing
         // the tokens. `HtmlElementList` prints them if they are borrowed, otherwise
         // they are printed by their original formatter.
-        let should_borrow_opening_r_angle = whitespace_sensitivity.is_strict()
-            && is_inline_tag
-            && !children.is_empty()
-            && !content_has_leading_whitespace;
-        let should_borrow_closing_tag = whitespace_sensitivity.is_strict()
-            && is_inline_tag
-            && !children.is_empty()
-            && !content_has_trailing_whitespace;
+        let should_borrow_opening_r_angle =
+            is_whitespace_sensitive && !children.is_empty() && !content_has_leading_whitespace;
+        let should_borrow_closing_tag =
+            is_whitespace_sensitive && !children.is_empty() && !content_has_trailing_whitespace;
 
         let borrowed_r_angle = if should_borrow_opening_r_angle {
             opening_element.r_angle_token().ok()

diff --git a/crates/biome_html_formatter/tests/specs/html/attributes/break.html.snap b/crates/biome_html_formatter/tests/specs/html/attributes/break.html.snap
@@ -23,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/attributes/multiline/break.html.snap b/crates/biome_html_formatter/tests/specs/html/attributes/multiline/break.html.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-assertion_line: 211
 info: attributes/multiline/break.html
 ---
 # Input
@@ -24,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 
@@ -41,7 +40,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Multiline
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/attributes/multiline/no-break.html.snap b/crates/biome_html_formatter/tests/specs/html/attributes/multiline/no-break.html.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-assertion_line: 211
 info: attributes/multiline/no-break.html
 ---
 # Input
@@ -24,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 
@@ -41,7 +40,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Multiline
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/attributes/no-break.html.snap b/crates/biome_html_formatter/tests/specs/html/attributes/no-break.html.snap
@@ -23,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/attributes/self-closing.html.snap b/crates/biome_html_formatter/tests/specs/html/attributes/self-closing.html.snap
@@ -23,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/attributes/single-quotes.html.snap b/crates/biome_html_formatter/tests/specs/html/attributes/single-quotes.html.snap
@@ -23,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/bracket-same-line/element.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/bracket-same-line/element.html.snap
@@ -31,7 +31,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 
@@ -54,7 +54,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: true
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/...s/biome_html_formatter/tests/specs/html/elements/bracket-same-line/self-closing.html.snap b/...s/biome_html_formatter/tests/specs/html/elements/bracket-same-line/self-closing.html.snap
@@ -29,7 +29,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 
@@ -52,7 +52,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: true
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/empty-extra-lines.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/empty-extra-lines.html.snap
@@ -25,7 +25,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/...s/biome_html_formatter/tests/specs/html/elements/inline/tags-dont-hug-content-2.html.snap b/...s/biome_html_formatter/tests/specs/html/elements/inline/tags-dont-hug-content-2.html.snap
@@ -25,7 +25,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/inline/tags-dont-hug-content.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/inline/tags-dont-hug-content.html.snap
@@ -23,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/..._html_formatter/tests/specs/html/elements/inline/tags-hug-content-longer-w-attr.html.snap b/..._html_formatter/tests/specs/html/elements/inline/tags-hug-content-longer-w-attr.html.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: elements/inline/tags-hug-content-longer.html
+info: elements/inline/tags-hug-content-longer-w-attr.html
 ---
 # Input
 
@@ -22,7 +22,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/...s/biome_html_formatter/tests/specs/html/elements/inline/tags-hug-content-w-attr.html.snap b/...s/biome_html_formatter/tests/specs/html/elements/inline/tags-hug-content-w-attr.html.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: elements/inline/tags-hug-content.html
+info: elements/inline/tags-hug-content-w-attr.html
 ---
 # Input
 
@@ -22,7 +22,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/inline/tags-hug-content.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/inline/tags-hug-content.html.snap
@@ -23,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/pre-with-brackets.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/pre-with-brackets.html.snap
@@ -32,7 +32,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/pre-with-braille.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/pre-with-braille.html.snap
@@ -54,7 +54,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/pre.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/pre.html.snap
@@ -35,7 +35,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/spacing/case0.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/spacing/case0.html.snap
@@ -28,7 +28,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/spacing/case1.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/spacing/case1.html.snap
@@ -30,7 +30,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/spacing/case2.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/spacing/case2.html.snap
@@ -28,7 +28,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/spacing/case3.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/spacing/case3.html.snap
@@ -28,7 +28,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/elements/spacing/case4.html.snap b/crates/biome_html_formatter/tests/specs/html/elements/spacing/case4.html.snap
@@ -25,7 +25,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/example.html.snap b/crates/biome_html_formatter/tests/specs/html/example.html.snap
@@ -23,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/long-content.html.snap b/crates/biome_html_formatter/tests/specs/html/long-content.html.snap
@@ -23,7 +23,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/many-children.html.snap b/crates/biome_html_formatter/tests/specs/html/many-children.html.snap
@@ -26,7 +26,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/crates/biome_html_formatter/tests/specs/html/self-closing.html.snap b/crates/biome_html_formatter/tests/specs/html/self-closing.html.snap
@@ -25,7 +25,7 @@ Line ending: LF
 Line width: 80
 Attribute Position: Auto
 Bracket same line: false
-Whitespace sensitivity: strict
+Whitespace sensitivity: css
 Indent script and style: false
 -----
 

diff --git a/packages/@biomejs/backend-jsonrpc/src/workspace.ts b/packages/@biomejs/backend-jsonrpc/src/workspace.ts