fix after rebase

crates/biome_cli/tests/commands/format.rs

@@ -591,6 +591,42 @@ fn applies_custom_quote_style() {
 
     let file_path = Path::new("file.js");
     fs.insert(file_path.into(), APPLY_QUOTE_STYLE_BEFORE.as_bytes());
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from(
+            [
+                ("format"),
+                ("--quote-style"),
+                ("single"),
+                ("--quote-properties"),
+                ("preserve"),
+                ("--write"),
+                file_path.as_os_str().to_str().unwrap(),
+            ]
+            .as_slice(),
+        ),
+    );
+
+    assert!(result.is_ok(), "run_cli returned {result:?}");
+
+    assert_file_contents(&fs, file_path, APPLY_QUOTE_STYLE_AFTER);
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "applies_custom_quote_style",
+        fs,
+        console,
+        result,
+    ));
+}
+
+#[test]
+fn applies_custom_css_quote_style() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
     let css_file_path = Path::new("file.css");
     fs.insert(
         css_file_path.into(),
@@ -603,12 +639,9 @@ fn applies_custom_quote_style() {
         Args::from(
             [
                 ("format"),
-                ("--quote-style"),
+                ("--css-formatter-quote-style"),
                 ("single"),
-                ("--quote-properties"),
-                ("preserve"),
                 ("--write"),
-                file_path.as_os_str().to_str().unwrap(),
                 css_file_path.as_os_str().to_str().unwrap(),
             ]
             .as_slice(),
@@ -617,12 +650,11 @@ fn applies_custom_quote_style() {
 
     assert!(result.is_ok(), "run_cli returned {result:?}");
 
-    assert_file_contents(&fs, file_path, APPLY_QUOTE_STYLE_AFTER);
     assert_file_contents(&fs, css_file_path, APPLY_CSS_QUOTE_STYLE_AFTER);
 
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
-        "applies_custom_quote_style",
+        "applies_custom_css_quote_style",
         fs,
         console,
         result,

crates/biome_cli/tests/snapshots/main_cases_overrides_formatter/does_include_file_with_different_languages.snap

@@ -16,11 +16,25 @@ expression: content
       "include": ["test2.js"],
       "formatter": { "lineWidth": 120, "indentStyle": "space" },
       "javascript": { "formatter": { "semicolons": "asNeeded" } }
+    },
+    {
+      "include": ["test.css"],
+      "formatter": { "lineWidth": 120, "indentStyle": "space" },
+      "css": { "formatter": { "quoteStyle": "single" } }
     }
   ]
 }
 ```
 
+## `test.css`
+
+```css
+[class='foo'] {
+  background-image: url('/path/to/file.jpg');
+}
+
+```
+
 ## `test.js`
 
 ```js
@@ -38,7 +52,7 @@ const a = ["loreum", "ipsum"]
 # Emitted Messages
 
 ```block
-Formatted 2 file(s) in <TIME>
+Formatted 3 file(s) in <TIME>
 ```
 
 

crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_css_quote_style.snap

@@ -0,0 +1,20 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `file.css`
+
+```css
+[class='foo'] {
+	background-image: url('/path/to/file.jpg');
+}
+
+```
+
+# Emitted Messages
+
+```block
+Formatted 1 file(s) in <TIME>
+```
+
+

crates/biome_service/src/configuration/css.rs

@@ -108,9 +108,7 @@ pub struct CssFormatter {
     #[bpaf(long("css-formatter-line-width"), argument("NUMBER"), optional)]
     pub line_width: Option<LineWidth>,
 
-    // TODO: Rename this to `css-formatter-quote-style` once it's also a
-    // top-level option. Right now this acts for both JS and CSS.
-    #[bpaf(long("quote-style"), argument("double|single"), optional, hide)]
+    #[bpaf(long("css-formatter-quote-style"), argument("double|single"), optional)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub quote_style: Option<QuoteStyle>,
 }

crates/biome_service/src/configuration/overrides.rs

@@ -445,6 +445,7 @@ fn to_javascript_language_settings(
         .or(parent_formatter.bracket_same_line);
     language_setting.formatter.enabled = formatter.enabled.or(parent_formatter.enabled);
     language_setting.formatter.line_width = formatter.line_width.or(parent_formatter.line_width);
+    language_setting.formatter.line_ending = formatter.line_ending.or(parent_formatter.line_ending);
     language_setting.formatter.indent_width = formatter
         .indent_width
         .map(Into::into)
@@ -482,6 +483,7 @@ fn to_json_language_settings(
 
     language_setting.formatter.enabled = formatter.enabled.or(parent_formatter.enabled);
     language_setting.formatter.line_width = formatter.line_width.or(parent_formatter.line_width);
+    language_setting.formatter.line_ending = formatter.line_ending.or(parent_formatter.line_ending);
     language_setting.formatter.indent_width = formatter
         .indent_width
         .map(Into::into)
@@ -515,6 +517,7 @@ fn to_css_language_settings(
 
     language_setting.formatter.enabled = formatter.enabled.or(parent_formatter.enabled);
     language_setting.formatter.line_width = formatter.line_width.or(parent_formatter.line_width);
+    language_setting.formatter.line_ending = formatter.line_ending.or(parent_formatter.line_ending);
     language_setting.formatter.indent_width = formatter
         .indent_width
         .map(Into::into)
@@ -524,6 +527,7 @@ fn to_css_language_settings(
         .indent_style
         .map(Into::into)
         .or(parent_formatter.indent_style);
+    language_setting.formatter.quote_style = formatter.quote_style.or(parent_formatter.quote_style);
 
     let parser = conf.parser.take().unwrap_or_default();
     let parent_parser = &parent_settings.parser;