fix(overrides): json.formatter.trailingCommas should work

crates/biome_cli/src/commands/rage.rs

@@ -263,7 +263,7 @@ impl Display for RageConfiguration<'_, '_> {
                             {KeyValuePair("Indent size", markup!({DebugDisplayOption(json_formatter_configuration.indent_size)}))}
                             {KeyValuePair("Line ending", markup!({DebugDisplayOption(json_formatter_configuration.line_ending)}))}
                             {KeyValuePair("Line width", markup!({DebugDisplayOption(json_formatter_configuration.line_width.map(|lw| lw.get()))}))}
-                            {KeyValuePair("Trailing Commas", markup!({DebugDisplayOption(json_formatter_configuration.trailing_commas)}))}
+                            {KeyValuePair("Trailing Commas", markup!({DebugDisplay(json_formatter_configuration.trailing_commas)}))}
                         ).fmt(fmt)?;
                     }
 

crates/biome_cli/tests/commands/format.rs

@@ -2302,7 +2302,7 @@ fn format_json_when_allow_trailing_commas_write() {
 }
 
 #[test]
-fn format_omits_json_trailing_comma() {
+fn format_json_trailing_commas_none() {
     let mut fs = MemoryFileSystem::default();
     let mut console = BufferConsole::default();
 
@@ -2338,15 +2338,15 @@ fn format_omits_json_trailing_comma() {
 
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
-        "format_omits_json_trailing_comma",
+        "format_json_trailing_commas_none",
         fs,
         console,
         result,
     ));
 }
 
 #[test]
-fn format_omits_json_trailing_comma_omit() {
+fn format_json_trailing_commas_all() {
     let mut fs = MemoryFileSystem::default();
     let mut console = BufferConsole::default();
 
@@ -2382,7 +2382,107 @@ fn format_omits_json_trailing_comma_omit() {
 
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
-        "format_omits_json_trailing_comma_omit",
+        "format_json_trailing_commas_all",
+        fs,
+        console,
+        result,
+    ));
+}
+
+#[test]
+fn format_json_trailing_commas_overrides_all() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let config_json = r#"{
+    "json": {
+        "parser": { "allowTrailingCommas": true },
+        "formatter": { "trailingCommas": "none" }
+    },
+    "overrides": [{
+        "include": ["file.json"],
+        "json": {
+            "formatter": { "trailingCommas": "all" }
+        }
+    }]
+}"#;
+    let biome_config = "biome.json";
+    let code = r#"{   "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar",
+}"#;
+    let file_path = Path::new("file.json");
+    fs.insert(file_path.into(), code.as_bytes());
+    fs.insert(biome_config.into(), config_json);
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from(
+            [
+                ("format"),
+                "--write",
+                file_path.as_os_str().to_str().unwrap(),
+            ]
+            .as_slice(),
+        ),
+    );
+
+    assert!(result.is_ok(), "run_cli returned {result:?}");
+
+    assert_file_contents(&fs, Path::new(file_path), "{\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n}\n");
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "format_json_trailing_commas_overrides_all",
+        fs,
+        console,
+        result,
+    ));
+}
+
+#[test]
+fn format_json_trailing_commas_overrides_none() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let config_json = r#"{
+    "json": {
+        "parser": { "allowTrailingCommas": true },
+        "formatter": { "trailingCommas": "all" }
+    },
+    "overrides": [{
+        "include": ["file.json"],
+        "json": {
+            "formatter": { "trailingCommas": "none" }
+        }
+    }]
+}"#;
+    let biome_config = "biome.json";
+    let code = r#"{   "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar", "loreum_ipsum_lorem_ipsum":   "bar",
+}"#;
+    let file_path = Path::new("file.json");
+    fs.insert(file_path.into(), code.as_bytes());
+    fs.insert(biome_config.into(), config_json);
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from(
+            [
+                ("format"),
+                "--write",
+                file_path.as_os_str().to_str().unwrap(),
+            ]
+            .as_slice(),
+        ),
+    );
+
+    assert!(result.is_ok(), "run_cli returned {result:?}");
+
+    assert_file_contents(&fs, Path::new(file_path), "{\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\",\n\t\"loreum_ipsum_lorem_ipsum\": \"bar\"\n}\n");
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "format_json_trailing_commas_overrides_none",
         fs,
         console,
         result,

crates/biome_cli/tests/snapshots/main_commands_format/format_omits_json_trailing_comma_omit.snap → crates/biome_cli/tests/snapshots/main_commands_format/format_json_trailing_commas_all.snap

@@ -31,5 +31,3 @@ expression: content
 ```block
 Formatted 1 file in <TIME>. Fixed 1 file.
 ```
-
-

crates/biome_cli/tests/snapshots/main_commands_format/format_omits_json_trailing_comma.snap → crates/biome_cli/tests/snapshots/main_commands_format/format_json_trailing_commas_none.snap

@@ -31,5 +31,3 @@ expression: content
 ```block
 Formatted 1 file in <TIME>. Fixed 1 file.
 ```
-
-

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

@@ -0,0 +1,41 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `biome.json`
+
+```json
+{
+  "json": {
+    "parser": { "allowTrailingCommas": true },
+    "formatter": { "trailingCommas": "none" }
+  },
+  "overrides": [
+    {
+      "include": ["file.json"],
+      "json": {
+        "formatter": { "trailingCommas": "all" }
+      }
+    }
+  ]
+}
+```
+
+## `file.json`
+
+```json
+{
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+}
+
+```
+
+# Emitted Messages
+
+```block
+Formatted 1 file in <TIME>. Fixed 1 file.
+```

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

@@ -0,0 +1,41 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `biome.json`
+
+```json
+{
+  "json": {
+    "parser": { "allowTrailingCommas": true },
+    "formatter": { "trailingCommas": "all" }
+  },
+  "overrides": [
+    {
+      "include": ["file.json"],
+      "json": {
+        "formatter": { "trailingCommas": "none" }
+      }
+    }
+  ]
+}
+```
+
+## `file.json`
+
+```json
+{
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar",
+	"loreum_ipsum_lorem_ipsum": "bar"
+}
+
+```
+
+# Emitted Messages
+
+```block
+Formatted 1 file in <TIME>. Fixed 1 file.
+```

crates/biome_cli/tests/snapshots/main_commands_rage/with_formatter_configuration.snap

@@ -110,7 +110,7 @@ JSON Formatter:
   Indent size:                  unset
   Line ending:                  Lf
   Line width:                   100
-  Trailing Commas:              unset
+  Trailing Commas:              None
 
 Server:
   Version:                      0.0.0
@@ -121,5 +121,3 @@ Server:
 Workspace:
   Open Documents:               0
 ```
-
-

crates/biome_json_formatter/src/context.rs

@@ -77,9 +77,9 @@ pub struct JsonFormatOptions {
 )]
 pub enum TrailingCommas {
     #[default]
-    /// The formatter will remove the trailing comma
+    /// The formatter will remove the trailing commas
     None,
-    /// The trailing comma is allowed and advised
+    /// The trailing commas are allowed and advised
     All,
 }
 
@@ -131,8 +131,8 @@ impl JsonFormatOptions {
         self
     }
 
-    pub fn with_trailing_comma(mut self, trailing_comma: TrailingCommas) -> Self {
-        self.trailing_commas = trailing_comma;
+    pub fn with_trailing_commas(mut self, trailing_commas: TrailingCommas) -> Self {
+        self.trailing_commas = trailing_commas;
         self
     }
 
@@ -152,6 +152,10 @@ impl JsonFormatOptions {
         self.line_width = line_width;
     }
 
+    pub fn set_trailing_commas(&mut self, trailing_commas: TrailingCommas) {
+        self.trailing_commas = trailing_commas;
+    }
+
     pub(crate) fn to_trailing_separator(&self) -> TrailingSeparator {
         match self.trailing_commas {
             TrailingCommas::None => TrailingSeparator::Omit,
@@ -192,6 +196,6 @@ impl fmt::Display for JsonFormatOptions {
         writeln!(f, "Indent width: {}", self.indent_width.value())?;
         writeln!(f, "Line ending: {}", self.line_ending)?;
         writeln!(f, "Line width: {}", self.line_width.get())?;
-        writeln!(f, "Trailing comma: {}", self.trailing_commas)
+        writeln!(f, "Trailing commas: {}", self.trailing_commas)
     }
 }

crates/biome_service/src/configuration/json.rs

@@ -71,7 +71,7 @@ pub struct JsonFormatter {
 
     /// Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to "none".
     #[partial(bpaf(long("json-formatter-trailing-commas"), argument("none|all"), optional))]
-    pub trailing_commas: Option<TrailingCommas>,
+    pub trailing_commas: TrailingCommas,
 }
 
 impl PartialJsonFormatter {
@@ -83,7 +83,7 @@ impl PartialJsonFormatter {
             indent_size: self.indent_size,
             line_ending: self.line_ending,
             line_width: self.line_width,
-            trailing_commas: self.trailing_commas,
+            trailing_commas: self.trailing_commas.unwrap_or_default(),
         }
     }
 }

crates/biome_service/src/configuration/overrides.rs

@@ -324,6 +324,9 @@ fn to_json_language_settings(
         .indent_style
         .map(Into::into)
         .or(parent_formatter.indent_style);
+    language_setting.formatter.trailing_commas = formatter
+        .trailing_commas
+        .or(parent_formatter.trailing_commas);
 
     let parser = conf.parser.take().unwrap_or_default();
     let parent_parser = &parent_settings.parser;

crates/biome_service/src/file_handlers/json.rs

@@ -38,7 +38,7 @@ pub struct JsonFormatterSettings {
     pub line_width: Option<LineWidth>,
     pub indent_width: Option<IndentWidth>,
     pub indent_style: Option<IndentStyle>,
-    pub trailing_comma: Option<TrailingCommas>,
+    pub trailing_commas: Option<TrailingCommas>,
     pub enabled: Option<bool>,
 }
 
@@ -95,7 +95,7 @@ impl Language for JsonLanguage {
                 .with_indent_style(indent_style)
                 .with_indent_width(indent_width)
                 .with_line_width(line_width)
-                .with_trailing_comma(language.trailing_comma.unwrap_or_default()),
+                .with_trailing_commas(language.trailing_commas.unwrap_or_default()),
         )
     }
 }

crates/biome_service/src/settings.rs

@@ -342,7 +342,7 @@ impl From<JsonConfiguration> for LanguageSettings<JsonLanguage> {
 
         language_setting.parser.allow_comments = json.parser.allow_comments;
         language_setting.parser.allow_trailing_commas = json.parser.allow_trailing_commas;
-        language_setting.formatter.trailing_comma = json.formatter.trailing_commas;
+        language_setting.formatter.trailing_commas = Some(json.formatter.trailing_commas);
         language_setting.formatter.enabled = Some(json.formatter.enabled);
         language_setting.formatter.line_width = json.formatter.line_width;
         language_setting.formatter.indent_width = json.formatter.indent_width.map(Into::into);
@@ -833,13 +833,15 @@ impl OverrideSettingPattern {
         if let Some(indent_style) = json_formatter.indent_style.or(self.formatter.indent_style) {
             options.set_indent_style(indent_style);
         }
-
         if let Some(indent_width) = json_formatter.indent_width.or(self.formatter.indent_width) {
             options.set_indent_width(indent_width)
         }
         if let Some(line_width) = json_formatter.line_width.or(self.formatter.line_width) {
             options.set_line_width(line_width);
         }
+        if let Some(trailing_commas) = json_formatter.trailing_commas {
+            options.set_trailing_commas(trailing_commas);
+        }
         let mut cache = self.cached_json_format_options.write().unwrap();
         let _ = cache.insert(options.clone());
     }