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

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

@@ -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_json_formatter/tests/specs/json/array/empty_line.json.snap

@@ -28,7 +28,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
-Trailing comma: None
+Trailing commas: None
 -----
 
 ```json
@@ -41,4 +41,3 @@ Trailing comma: None
 }
 ```
 
-

crates/biome_json_formatter/tests/specs/json/array/fill_layout.json.snap

@@ -24,7 +24,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
-Trailing comma: None
+Trailing commas: None
 -----
 
 ```json
@@ -34,4 +34,3 @@ Trailing comma: None
 ]
 ```
 
-

crates/biome_json_formatter/tests/specs/json/array/layout.json.snap

@@ -32,7 +32,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
-Trailing comma: None
+Trailing commas: None
 -----
 
 ```json
@@ -64,4 +64,3 @@ Trailing comma: None
 }
 ```
 
-

crates/biome_json_formatter/tests/specs/json/array/multi_line.json.snap

@@ -28,7 +28,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
-Trailing comma: None
+Trailing commas: None
 -----
 
 ```json
@@ -47,4 +47,3 @@ Trailing comma: None
 }
 ```
 
-

crates/biome_json_formatter/tests/specs/json/array/nested.json.snap

@@ -24,7 +24,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
-Trailing comma: None
+Trailing commas: None
 -----
 
 ```json
@@ -50,4 +50,3 @@ Trailing comma: None
 }
 ```
 
-

crates/biome_json_formatter/tests/specs/json/array/one_per_line_layout.json.snap

@@ -32,7 +32,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
-Trailing comma: None
+Trailing commas: None
 -----
 
 ```json
@@ -81,4 +81,3 @@ Trailing comma: None
 }
 ```
 
-

crates/biome_json_formatter/tests/specs/json/array/single_line.json.snap

@@ -29,7 +29,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
-Trailing comma: None
+Trailing commas: None
 -----
 
 ```json
@@ -39,4 +39,3 @@ Trailing comma: None
 }
 ```
 
-

crates/biome_json_formatter/tests/specs/json/comments/empty_with_comments.json.snap

@@ -36,7 +36,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
-Trailing comma: None
+Trailing commas: None
 -----
 
 ```json
@@ -64,4 +64,3 @@ Trailing comma: None
 }
 ```
 
-