diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15b00303be4f..1eddfafbc10d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,10 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 ### Configuration
 
+#### Enhancements
+
+- The `javascript.formatter.trailingComma` option is deprecated and renamed to `javascript.formatter.trailingCommas`. The corresponding CLI option `--trailing-comma` is also deprecated and renamed to `--trailing-commas`. Details can be checked in [#2492](https://github.com/biomejs/biome/pull/2492). Contributed by @Sec-ant
+
 ### Editors
 
 #### New features
diff --git a/Cargo.lock b/Cargo.lock
index 425adb71419b..251c96dd9bd9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -832,6 +832,7 @@ dependencies = [
  "biome_analyze",
  "biome_console",
  "biome_diagnostics",
+ "biome_json_analyze",
  "biome_json_factory",
  "biome_json_parser",
  "biome_json_syntax",
diff --git a/crates/biome_cli/src/commands/format.rs b/crates/biome_cli/src/commands/format.rs
index 7efae9ddaf6d..61577c7b4125 100644
--- a/crates/biome_cli/src/commands/format.rs
+++ b/crates/biome_cli/src/commands/format.rs
@@ -82,7 +82,9 @@ pub(crate) fn format(
                 {PrintDiagnostic::simple(&diagnostic)}
             });
 
-            config.indent_width = Some(indent_size);
+            if config.indent_width.is_none() {
+                config.indent_width = Some(indent_size);
+            }
         }
     }
     // TODO: remove in biome 2.0
@@ -95,7 +97,22 @@ pub(crate) fn format(
                 {PrintDiagnostic::simple(&diagnostic)}
             });
 
-            js_formatter.indent_width = Some(indent_size);
+            if js_formatter.indent_width.is_none() {
+                js_formatter.indent_width = Some(indent_size);
+            }
+        }
+
+        if let Some(trailing_comma) = js_formatter.trailing_comma {
+            let diagnostic = DeprecatedArgument::new(markup! {
+                "The argument "<Emphasis>"--trailing-comma"</Emphasis>" is deprecated, it will be removed in the next major release. Use "<Emphasis>"--trailing-commas"</Emphasis>" instead."
+            });
+            console.error(markup! {
+                {PrintDiagnostic::simple(&diagnostic)}
+            });
+
+            if js_formatter.trailing_commas.is_none() {
+                js_formatter.trailing_commas = Some(trailing_comma);
+            }
         }
     }
     // TODO: remove in biome 2.0
@@ -108,7 +125,9 @@ pub(crate) fn format(
                 {PrintDiagnostic::simple(&diagnostic)}
             });
 
-            json_formatter.indent_width = Some(indent_size);
+            if json_formatter.indent_width.is_none() {
+                json_formatter.indent_width = Some(indent_size);
+            }
         }
     }
     // TODO: remove in biome 2.0
@@ -121,7 +140,9 @@ pub(crate) fn format(
                 {PrintDiagnostic::simple(&diagnostic)}
             });
 
-            css_formatter.indent_width = Some(indent_size);
+            if css_formatter.indent_width.is_none() {
+                css_formatter.indent_width = Some(indent_size);
+            }
         }
     }
 
diff --git a/crates/biome_cli/src/commands/rage.rs b/crates/biome_cli/src/commands/rage.rs
index ff841bb8a4a3..7d3edd44e9c5 100644
--- a/crates/biome_cli/src/commands/rage.rs
+++ b/crates/biome_cli/src/commands/rage.rs
@@ -216,7 +216,6 @@ impl Display for RageConfiguration<'_, '_> {
                             {Section("Formatter")}
                             {KeyValuePair("Format with errors", markup!({DebugDisplay(configuration.get_formatter_configuration().format_with_errors)}))}
                             {KeyValuePair("Indent style", markup!({DebugDisplay(formatter_configuration.indent_style)}))}
-                            {KeyValuePair("Indent size", markup!({DebugDisplay(formatter_configuration.indent_size)}))}
                             {KeyValuePair("Indent width", markup!({DebugDisplay(formatter_configuration.indent_width)}))}
                             {KeyValuePair("Line ending", markup!({DebugDisplay(formatter_configuration.line_ending)}))}
                             {KeyValuePair("Line width", markup!({DebugDisplay(formatter_configuration.line_width.get())}))}
@@ -232,14 +231,13 @@ impl Display for RageConfiguration<'_, '_> {
                             {KeyValuePair("Enabled", markup!({DebugDisplay(javascript_formatter_configuration.enabled)}))}
                             {KeyValuePair("JSX quote style", markup!({DebugDisplay(javascript_formatter_configuration.jsx_quote_style)}))}
                             {KeyValuePair("Quote properties", markup!({DebugDisplay(javascript_formatter_configuration.quote_properties)}))}
-                            {KeyValuePair("Trailing comma", markup!({DebugDisplay(javascript_formatter_configuration.trailing_comma)}))}
+                            {KeyValuePair("Trailing commas", markup!({DebugDisplay(javascript_formatter_configuration.trailing_commas)}))}
                             {KeyValuePair("Semicolons", markup!({DebugDisplay(javascript_formatter_configuration.semicolons)}))}
                             {KeyValuePair("Arrow parentheses", markup!({DebugDisplay(javascript_formatter_configuration.arrow_parentheses)}))}
                             {KeyValuePair("Bracket spacing", markup!({DebugDisplay(javascript_formatter_configuration.bracket_spacing)}))}
                             {KeyValuePair("Bracket same line", markup!({DebugDisplay(javascript_formatter_configuration.bracket_same_line)}))}
                             {KeyValuePair("Quote style", markup!({DebugDisplay(javascript_formatter_configuration.quote_style)}))}
                             {KeyValuePair("Indent style", markup!({DebugDisplayOption(javascript_formatter_configuration.indent_style)}))}
-                            {KeyValuePair("Indent size", markup!({DebugDisplayOption(javascript_formatter_configuration.indent_size)}))}
                             {KeyValuePair("Indent width", markup!({DebugDisplayOption(javascript_formatter_configuration.indent_width)}))}
                             {KeyValuePair("Line ending", markup!({DebugDisplayOption(javascript_formatter_configuration.line_ending)}))}
                             {KeyValuePair("Line width", markup!({DebugDisplayOption(javascript_formatter_configuration.line_width.map(|lw| lw.get()))}))}
@@ -254,7 +252,6 @@ impl Display for RageConfiguration<'_, '_> {
                             {KeyValuePair("Enabled", markup!({DebugDisplay(json_formatter_configuration.enabled)}))}
                             {KeyValuePair("Indent style", markup!({DebugDisplayOption(json_formatter_configuration.indent_style)}))}
                             {KeyValuePair("Indent width", markup!({DebugDisplayOption(json_formatter_configuration.indent_width)}))}
-                            {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)}))}
diff --git a/crates/biome_cli/src/execute/migrate/prettier.rs b/crates/biome_cli/src/execute/migrate/prettier.rs
index 14a99f261311..89a10d414ee8 100644
--- a/crates/biome_cli/src/execute/migrate/prettier.rs
+++ b/crates/biome_cli/src/execute/migrate/prettier.rs
@@ -8,7 +8,7 @@ use biome_formatter::{
     AttributePosition, LineEnding, LineWidth, LineWidthFromIntError, QuoteStyle,
 };
 use biome_fs::{FileSystem, OpenOptions};
-use biome_js_formatter::context::{ArrowParentheses, QuoteProperties, Semicolons, TrailingComma};
+use biome_js_formatter::context::{ArrowParentheses, QuoteProperties, Semicolons, TrailingCommas};
 use biome_json_parser::JsonParserOptions;
 use biome_service::DynRef;
 use std::path::Path;
@@ -36,7 +36,7 @@ pub(crate) struct PrettierConfiguration {
     print_width: u16,
     /// https://prettier.io/docs/en/options#use-tabs
     use_tabs: bool,
-    /// https://prettier.io/docs/en/options#trailing-comma
+    /// https://prettier.io/docs/en/options#trailing-commas
     trailing_comma: PrettierTrailingComma,
     /// https://prettier.io/docs/en/options#tab-width
     tab_width: u8,
@@ -93,7 +93,7 @@ pub(crate) struct OverrideOptions {
     print_width: Option<u16>,
     /// https://prettier.io/docs/en/options#use-tabs
     use_tabs: Option<bool>,
-    /// https://prettier.io/docs/en/options#trailing-comma
+    /// https://prettier.io/docs/en/options#trailing-commas
     trailing_comma: Option<PrettierTrailingComma>,
     /// https://prettier.io/docs/en/options#tab-width
     tab_width: Option<u8>,
@@ -147,7 +147,7 @@ enum QuoteProps {
     Preserve,
 }
 
-impl From<PrettierTrailingComma> for TrailingComma {
+impl From<PrettierTrailingComma> for TrailingCommas {
     fn from(value: PrettierTrailingComma) -> Self {
         match value {
             PrettierTrailingComma::All => Self::All,
@@ -240,7 +240,9 @@ impl TryFrom<PrettierConfiguration> for biome_configuration::PartialConfiguratio
             bracket_same_line: Some(value.bracket_line),
             arrow_parentheses: Some(value.arrow_parens.into()),
             semicolons: Some(semicolons),
-            trailing_comma: Some(value.trailing_comma.into()),
+            trailing_commas: Some(value.trailing_comma.into()),
+            // deprecated
+            trailing_comma: None,
             quote_style: Some(quote_style),
             quote_properties: Some(value.quote_props.into()),
             bracket_spacing: Some(value.bracket_spacing),
@@ -335,7 +337,7 @@ impl TryFrom<Override> for biome_configuration::OverridePattern {
             bracket_same_line: options.bracket_line,
             arrow_parentheses: options.arrow_parens.map(|arrow_parens| arrow_parens.into()),
             semicolons,
-            trailing_comma: options
+            trailing_commas: options
                 .trailing_comma
                 .map(|trailing_comma| trailing_comma.into()),
             quote_style,
diff --git a/crates/biome_cli/tests/commands/format.rs b/crates/biome_cli/tests/commands/format.rs
index 1decf72ded5e..f0f6b0f0aa7d 100644
--- a/crates/biome_cli/tests/commands/format.rs
+++ b/crates/biome_cli/tests/commands/format.rs
@@ -79,7 +79,7 @@ const hello: string = "world";
 </script>
 <div></div>"#;
 
-const APPLY_TRAILING_COMMA_BEFORE: &str = r#"
+const APPLY_TRAILING_COMMAS_BEFORE: &str = r#"
 const a = [
 	longlonglonglongItem1longlonglonglongItem1,
 	longlonglonglongItem1longlonglonglongItem2,
@@ -87,7 +87,7 @@ const a = [
 ];
 "#;
 
-const APPLY_TRAILING_COMMA_AFTER: &str = r#"const a = [
+const APPLY_TRAILING_COMMAS_AFTER: &str = r#"const a = [
 	longlonglonglongItem1longlonglonglongItem1,
 	longlonglonglongItem1longlonglonglongItem2,
 	longlonglonglongItem1longlonglonglongItem3
@@ -743,12 +743,48 @@ fn applies_custom_css_quote_style() {
 }
 
 #[test]
-fn applies_custom_trailing_comma() {
+fn applies_custom_trailing_commas() {
     let mut fs = MemoryFileSystem::default();
     let mut console = BufferConsole::default();
 
     let file_path = Path::new("file.js");
-    fs.insert(file_path.into(), APPLY_TRAILING_COMMA_BEFORE.as_bytes());
+    fs.insert(file_path.into(), APPLY_TRAILING_COMMAS_BEFORE.as_bytes());
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from(
+            [
+                ("format"),
+                ("--trailing-commas"),
+                ("none"),
+                ("--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_TRAILING_COMMAS_AFTER);
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "applies_custom_trailing_commas",
+        fs,
+        console,
+        result,
+    ));
+}
+
+#[test]
+fn applies_custom_trailing_commas_using_the_deprecated_option() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let file_path = Path::new("file.js");
+    fs.insert(file_path.into(), APPLY_TRAILING_COMMAS_BEFORE.as_bytes());
 
     let result = run_cli(
         DynRef::Borrowed(&mut fs),
@@ -767,11 +803,49 @@ fn applies_custom_trailing_comma() {
 
     assert!(result.is_ok(), "run_cli returned {result:?}");
 
-    assert_file_contents(&fs, file_path, APPLY_TRAILING_COMMA_AFTER);
+    assert_file_contents(&fs, file_path, APPLY_TRAILING_COMMAS_AFTER);
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "applies_custom_trailing_commas_using_the_deprecated_option",
+        fs,
+        console,
+        result,
+    ));
+}
+
+#[test]
+fn applies_custom_trailing_commas_overriding_the_deprecated_option() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let file_path = Path::new("file.js");
+    fs.insert(file_path.into(), APPLY_TRAILING_COMMAS_BEFORE.as_bytes());
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from(
+            [
+                ("format"),
+                ("--trailing-commas"),
+                ("none"),
+                ("--trailing-comma"),
+                ("all"),
+                ("--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_TRAILING_COMMAS_AFTER);
 
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
-        "applies_custom_trailing_comma",
+        "applies_custom_trailing_commas_overriding_the_deprecated_option",
         fs,
         console,
         result,
@@ -923,21 +997,21 @@ fn applies_custom_bracket_same_line() {
 }
 
 #[test]
-fn trailing_comma_parse_errors() {
+fn trailing_commas_parse_errors() {
     let mut console = BufferConsole::default();
     let mut fs = MemoryFileSystem::default();
 
     let result = run_cli(
         DynRef::Borrowed(&mut fs),
         &mut console,
-        Args::from([("format"), ("--trailing-comma"), ("NONE"), ("file.js")].as_slice()),
+        Args::from([("format"), ("--trailing-commas"), ("NONE"), ("file.js")].as_slice()),
     );
 
     assert!(result.is_err(), "run_cli returned {result:?}");
 
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),
-        "trailing_comma_parse_errors",
+        "trailing_commas_parse_errors",
         fs,
         console,
         result,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap b/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap
index 89c5be7d04f9..b3fab644ca85 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap
@@ -35,6 +35,8 @@ The configuration that is contained inside the file `biome.json`
         --quote-properties=<preserve|as-needed>  When properties in objects are quoted. Defaults to asNeeded.
         --trailing-comma=<all|es5|none>  Print trailing commas wherever possible in multi-line comma-separated
                               syntactic structures. Defaults to "all".
+        --trailing-commas=<all|es5|none>  Print trailing commas wherever possible in multi-line comma-separated
+                              syntactic structures. Defaults to "all".
         --semicolons=<always|as-needed>  Whether the formatter prints semicolons for all statements or
                               only in for statements where it is necessary because of ASI.
         --arrow-parentheses=<always|as-needed>  Whether to add non-necessary parentheses to arrow functions.
diff --git a/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap b/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap
index 8bb1b4e40933..d430c10412dc 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap
@@ -37,6 +37,8 @@ The configuration that is contained inside the file `biome.json`
         --quote-properties=<preserve|as-needed>  When properties in objects are quoted. Defaults to asNeeded.
         --trailing-comma=<all|es5|none>  Print trailing commas wherever possible in multi-line comma-separated
                               syntactic structures. Defaults to "all".
+        --trailing-commas=<all|es5|none>  Print trailing commas wherever possible in multi-line comma-separated
+                              syntactic structures. Defaults to "all".
         --semicolons=<always|as-needed>  Whether the formatter prints semicolons for all statements or
                               only in for statements where it is necessary because of ASI.
         --arrow-parentheses=<always|as-needed>  Whether to add non-necessary parentheses to arrow functions.
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_comma.snap b/crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_commas.snap
similarity index 100%
rename from crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_comma.snap
rename to crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_commas.snap
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_commas_overriding_the_deprecated_option.snap b/crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_commas_overriding_the_deprecated_option.snap
new file mode 100644
index 000000000000..473ed6571268
--- /dev/null
+++ b/crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_commas_overriding_the_deprecated_option.snap
@@ -0,0 +1,28 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `file.js`
+
+```js
+const a = [
+	longlonglonglongItem1longlonglonglongItem1,
+	longlonglonglongItem1longlonglonglongItem2,
+	longlonglonglongItem1longlonglonglongItem3
+];
+
+```
+
+# Emitted Messages
+
+```block
+internalError/fs  DEPRECATED  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  ! The argument --trailing-comma is deprecated, it will be removed in the next major release. Use --trailing-commas instead.
+  
+
+```
+
+```block
+Formatted 1 file in <TIME>. Fixed 1 file.
+```
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_commas_using_the_deprecated_option.snap b/crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_commas_using_the_deprecated_option.snap
new file mode 100644
index 000000000000..473ed6571268
--- /dev/null
+++ b/crates/biome_cli/tests/snapshots/main_commands_format/applies_custom_trailing_commas_using_the_deprecated_option.snap
@@ -0,0 +1,28 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `file.js`
+
+```js
+const a = [
+	longlonglonglongItem1longlonglonglongItem1,
+	longlonglonglongItem1longlonglonglongItem2,
+	longlonglonglongItem1longlonglonglongItem3
+];
+
+```
+
+# Emitted Messages
+
+```block
+internalError/fs  DEPRECATED  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  ! The argument --trailing-comma is deprecated, it will be removed in the next major release. Use --trailing-commas instead.
+  
+
+```
+
+```block
+Formatted 1 file in <TIME>. Fixed 1 file.
+```
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap b/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap
index e8f0a39a82c3..eb305c4338ca 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap
@@ -23,6 +23,8 @@ Formatting options specific to the JavaScript files
         --quote-properties=<preserve|as-needed>  When properties in objects are quoted. Defaults to asNeeded.
         --trailing-comma=<all|es5|none>  Print trailing commas wherever possible in multi-line comma-separated
                               syntactic structures. Defaults to "all".
+        --trailing-commas=<all|es5|none>  Print trailing commas wherever possible in multi-line comma-separated
+                              syntactic structures. Defaults to "all".
         --semicolons=<always|as-needed>  Whether the formatter prints semicolons for all statements or
                               only in for statements where it is necessary because of ASI.
         --arrow-parentheses=<always|as-needed>  Whether to add non-necessary parentheses to arrow functions.
diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/trailing_comma_parse_errors.snap b/crates/biome_cli/tests/snapshots/main_commands_format/trailing_commas_parse_errors.snap
similarity index 99%
rename from crates/biome_cli/tests/snapshots/main_commands_format/trailing_comma_parse_errors.snap
rename to crates/biome_cli/tests/snapshots/main_commands_format/trailing_commas_parse_errors.snap
index 098b7e97ed5e..02a5ad5bff68 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_format/trailing_comma_parse_errors.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_format/trailing_commas_parse_errors.snap
@@ -10,10 +10,8 @@ flags/invalid ━━━━━━━━━━━━━━━━━━━━━━
   × Failed to parse CLI arguments.
     
     Caused by:
-      couldn't parse `NONE`: Value not supported for TrailingComma
+      couldn't parse `NONE`: Value not supported for TrailingCommas
   
 
 
 ```
-
-
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate.snap
index a4b79e14c060..eb93e7bfc99e 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate.snap
@@ -37,7 +37,7 @@ biome.json migrate ━━━━━━━━━━━━━━━━━━━━
       13 │ + → → "formatter":·{
       14 │ + → → → "jsxQuoteStyle":·"double",
       15 │ + → → → "quoteProperties":·"asNeeded",
-      16 │ + → → → "trailingComma":·"all",
+      16 │ + → → → "trailingCommas":·"all",
       17 │ + → → → "semicolons":·"always",
       18 │ + → → → "arrowParentheses":·"always",
       19 │ + → → → "bracketSpacing":·true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_end_of_line.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_end_of_line.snap
index 4e701aed890d..670ceff5b48a 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_end_of_line.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_end_of_line.snap
@@ -40,7 +40,7 @@ biome.json migrate ━━━━━━━━━━━━━━━━━━━━
       12 │ + → → "formatter":·{
       13 │ + → → → "jsxQuoteStyle":·"double",
       14 │ + → → → "quoteProperties":·"asNeeded",
-      15 │ + → → → "trailingComma":·"all",
+      15 │ + → → → "trailingCommas":·"all",
       16 │ + → → → "semicolons":·"asNeeded",
       17 │ + → → → "arrowParentheses":·"always",
       18 │ + → → → "bracketSpacing":·true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_jsonc.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_jsonc.snap
index c48e3edc2f98..be77b41c92af 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_jsonc.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_jsonc.snap
@@ -37,7 +37,7 @@ biome.jsonc migrate ━━━━━━━━━━━━━━━━━━━━
       13 │ + → → "formatter":·{
       14 │ + → → → "jsxQuoteStyle":·"double",
       15 │ + → → → "quoteProperties":·"asNeeded",
-      16 │ + → → → "trailingComma":·"all",
+      16 │ + → → → "trailingCommas":·"all",
       17 │ + → → → "semicolons":·"always",
       18 │ + → → → "arrowParentheses":·"always",
       19 │ + → → → "bracketSpacing":·true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_overrides.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_overrides.snap
index 3e607c1d0231..1215b3fc6fcc 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_overrides.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_overrides.snap
@@ -47,7 +47,7 @@ biome.json migrate ━━━━━━━━━━━━━━━━━━━━
       12 │ + → → "formatter":·{
       13 │ + → → → "jsxQuoteStyle":·"double",
       14 │ + → → → "quoteProperties":·"asNeeded",
-      15 │ + → → → "trailingComma":·"all",
+      15 │ + → → → "trailingCommas":·"all",
       16 │ + → → → "semicolons":·"asNeeded",
       17 │ + → → → "arrowParentheses":·"always",
       18 │ + → → → "bracketSpacing":·true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_with_ignore.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_with_ignore.snap
index d756d3ab144e..b3c417ab05f3 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_with_ignore.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_with_ignore.snap
@@ -51,7 +51,7 @@ biome.json migrate ━━━━━━━━━━━━━━━━━━━━
       14 │ + → → "formatter":·{
       15 │ + → → → "jsxQuoteStyle":·"double",
       16 │ + → → → "quoteProperties":·"asNeeded",
-      17 │ + → → → "trailingComma":·"all",
+      17 │ + → → → "trailingCommas":·"all",
       18 │ + → → → "semicolons":·"always",
       19 │ + → → → "arrowParentheses":·"always",
       20 │ + → → → "bracketSpacing":·true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write.snap
index b0da1c382290..9a5c4f229a72 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write.snap
@@ -20,7 +20,7 @@ expression: content
     "formatter": {
       "jsxQuoteStyle": "double",
       "quoteProperties": "asNeeded",
-      "trailingComma": "all",
+      "trailingCommas": "all",
       "semicolons": "always",
       "arrowParentheses": "always",
       "bracketSpacing": true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_biome_jsonc.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_biome_jsonc.snap
index 056e09bfad5e..7889f3fe8662 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_biome_jsonc.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_biome_jsonc.snap
@@ -20,7 +20,7 @@ expression: content
     "formatter": {
       "jsxQuoteStyle": "double",
       "quoteProperties": "asNeeded",
-      "trailingComma": "all",
+      "trailingCommas": "all",
       "semicolons": "always",
       "arrowParentheses": "always",
       "bracketSpacing": true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_packagejson.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_packagejson.snap
index b488e0190ec4..ad4ab88c1935 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_packagejson.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_packagejson.snap
@@ -20,7 +20,7 @@ expression: content
     "formatter": {
       "jsxQuoteStyle": "double",
       "quoteProperties": "asNeeded",
-      "trailingComma": "all",
+      "trailingCommas": "all",
       "semicolons": "always",
       "arrowParentheses": "always",
       "bracketSpacing": true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_with_ignore_file.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_with_ignore_file.snap
index 939a8fb8e3d3..ffcb7a5e27dd 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_with_ignore_file.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettier_migrate_write_with_ignore_file.snap
@@ -21,7 +21,7 @@ expression: content
     "formatter": {
       "jsxQuoteStyle": "double",
       "quoteProperties": "asNeeded",
-      "trailingComma": "all",
+      "trailingCommas": "all",
       "semicolons": "always",
       "arrowParentheses": "always",
       "bracketSpacing": true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettierjson_migrate_write.snap b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettierjson_migrate_write.snap
index 1b9ef4486ea9..a82370315c63 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettierjson_migrate_write.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_migrate_prettier/prettierjson_migrate_write.snap
@@ -20,7 +20,7 @@ expression: content
     "formatter": {
       "jsxQuoteStyle": "double",
       "quoteProperties": "asNeeded",
-      "trailingComma": "all",
+      "trailingCommas": "all",
       "semicolons": "always",
       "arrowParentheses": "always",
       "bracketSpacing": true,
diff --git a/crates/biome_cli/tests/snapshots/main_commands_rage/with_formatter_configuration.snap b/crates/biome_cli/tests/snapshots/main_commands_rage/with_formatter_configuration.snap
index 75589180a16c..a42e037bd57e 100644
--- a/crates/biome_cli/tests/snapshots/main_commands_rage/with_formatter_configuration.snap
+++ b/crates/biome_cli/tests/snapshots/main_commands_rage/with_formatter_configuration.snap
@@ -78,7 +78,6 @@ Biome Configuration:
 Formatter:
   Format with errors:           true
   Indent style:                 Space
-  Indent size:                  0
   Indent width:                 2
   Line ending:                  Lf
   Line width:                   120
@@ -90,14 +89,13 @@ JavaScript Formatter:
   Enabled:                      true
   JSX quote style:              Single
   Quote properties:             AsNeeded
-  Trailing comma:               All
+  Trailing commas:              All
   Semicolons:                   Always
   Arrow parentheses:            Always
   Bracket spacing:              false
   Bracket same line:            false
   Quote style:                  Double
   Indent style:                 Tab
-  Indent size:                  unset
   Indent width:                 2
   Line ending:                  Lf
   Line width:                   100
@@ -107,7 +105,6 @@ JSON Formatter:
   Enabled:                      true
   Indent style:                 Space
   Indent width:                 2
-  Indent size:                  unset
   Line ending:                  Lf
   Line width:                   100
   Trailing Commas:              unset
diff --git a/crates/biome_configuration/src/javascript/formatter.rs b/crates/biome_configuration/src/javascript/formatter.rs
index c262cb8c489f..1cdd5991089a 100644
--- a/crates/biome_configuration/src/javascript/formatter.rs
+++ b/crates/biome_configuration/src/javascript/formatter.rs
@@ -1,8 +1,9 @@
 use crate::PlainIndentStyle;
 use biome_deserialize_macros::{Deserializable, Merge, Partial};
 use biome_formatter::{AttributePosition, LineEnding, LineWidth, QuoteStyle};
-use biome_js_formatter::context::trailing_comma::TrailingComma;
-use biome_js_formatter::context::{ArrowParentheses, QuoteProperties, Semicolons};
+use biome_js_formatter::context::{
+    trailing_commas::TrailingCommas, ArrowParentheses, QuoteProperties, Semicolons,
+};
 use bpaf::Bpaf;
 use serde::{Deserialize, Serialize};
 
@@ -20,9 +21,15 @@ pub struct JavascriptFormatter {
     #[partial(bpaf(long("quote-properties"), argument("preserve|as-needed"), optional))]
     pub quote_properties: QuoteProperties,
 
+    // TODO: Remove in 2.0.0
     /// Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to "all".
     #[partial(bpaf(long("trailing-comma"), argument("all|es5|none"), optional))]
-    pub trailing_comma: TrailingComma,
+    #[partial(deserializable(deprecated(use_instead = "javascript.formatter.trailingCommas")))]
+    pub trailing_comma: TrailingCommas,
+
+    /// Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to "all".
+    #[partial(bpaf(long("trailing-commas"), argument("all|es5|none"), optional))]
+    pub trailing_commas: TrailingCommas,
 
     /// Whether the formatter prints semicolons for all statements or only in for statements where it is necessary because of ASI.
     #[partial(bpaf(long("semicolons"), argument("always|as-needed"), optional))]
@@ -52,6 +59,7 @@ pub struct JavascriptFormatter {
     ))]
     pub indent_style: Option<PlainIndentStyle>,
 
+    // TODO: Remove in 2.0.0
     /// The size of the indentation applied to JavaScript (and its super languages) files. Default to 2.
     #[partial(deserializable(deprecated(use_instead = "javascript.formatter.indentWidth")))]
     #[partial(bpaf(long("javascript-formatter-indent-size"), argument("NUMBER"), optional))]
@@ -100,6 +108,7 @@ impl PartialJavascriptFormatter {
             jsx_quote_style: self.jsx_quote_style.unwrap_or_default(),
             quote_properties: self.quote_properties.unwrap_or_default(),
             trailing_comma: self.trailing_comma.unwrap_or_default(),
+            trailing_commas: self.trailing_commas.unwrap_or_default(),
             semicolons: self.semicolons.unwrap_or_default(),
             arrow_parentheses: self.arrow_parentheses.unwrap_or_default(),
             bracket_spacing: self.bracket_spacing.unwrap_or_default(),
@@ -122,6 +131,7 @@ impl Default for JavascriptFormatter {
             jsx_quote_style: Default::default(),
             quote_properties: Default::default(),
             trailing_comma: Default::default(),
+            trailing_commas: Default::default(),
             semicolons: Default::default(),
             arrow_parentheses: Default::default(),
             bracket_spacing: true,
diff --git a/crates/biome_js_analyze/src/lint/style/use_enum_initializers.rs b/crates/biome_js_analyze/src/lint/style/use_enum_initializers.rs
index 90526d1388a3..ce58512dcc0f 100644
--- a/crates/biome_js_analyze/src/lint/style/use_enum_initializers.rs
+++ b/crates/biome_js_analyze/src/lint/style/use_enum_initializers.rs
@@ -175,7 +175,7 @@ impl Rule for UseEnumInitializers {
                     has_mutations = true;
 
                     // When creating the replacement node we first need to remove the trailing trivia.
-                    // Otherwise nodes without trailing comma will add [JsSyntacKind::EQ] and [EnumInitializer]
+                    // Otherwise nodes without a trailing comma will add [JsSyntacKind::EQ] and [EnumInitializer]
                     // after it.
                     let new_enum_member = enum_member
                         .clone()
diff --git a/crates/biome_js_formatter/src/context.rs b/crates/biome_js_formatter/src/context.rs
index 1591ceea6cf1..e140bc174f01 100644
--- a/crates/biome_js_formatter/src/context.rs
+++ b/crates/biome_js_formatter/src/context.rs
@@ -1,4 +1,4 @@
-pub mod trailing_comma;
+pub mod trailing_commas;
 
 use crate::comments::{FormatJsLeadingComment, JsCommentStyle, JsComments};
 use biome_deserialize_macros::{Deserializable, Merge};
@@ -12,7 +12,7 @@ use std::fmt;
 use std::fmt::Debug;
 use std::rc::Rc;
 use std::str::FromStr;
-pub use trailing_comma::TrailingComma;
+pub use trailing_commas::TrailingCommas;
 
 #[derive(Debug, Clone)]
 pub struct JsFormatContext {
@@ -153,7 +153,7 @@ pub struct JsFormatOptions {
     quote_properties: QuoteProperties,
 
     /// Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to "all".
-    trailing_comma: TrailingComma,
+    trailing_commas: TrailingCommas,
 
     /// Whether the formatter prints semicolons for all statements, class members, and type members or only when necessary because of [ASI](https://tc39.es/ecma262/multipage/ecmascript-language-lexical-grammar.html#sec-automatic-semicolon-insertion).
     semicolons: Semicolons,
@@ -185,7 +185,7 @@ impl JsFormatOptions {
             quote_style: QuoteStyle::default(),
             jsx_quote_style: QuoteStyle::default(),
             quote_properties: QuoteProperties::default(),
-            trailing_comma: TrailingComma::default(),
+            trailing_commas: TrailingCommas::default(),
             semicolons: Semicolons::default(),
             arrow_parentheses: ArrowParentheses::default(),
             bracket_spacing: BracketSpacing::default(),
@@ -244,8 +244,8 @@ impl JsFormatOptions {
         self
     }
 
-    pub fn with_trailing_comma(mut self, trailing_comma: TrailingComma) -> Self {
-        self.trailing_comma = trailing_comma;
+    pub fn with_trailing_commas(mut self, trailing_commas: TrailingCommas) -> Self {
+        self.trailing_commas = trailing_commas;
         self
     }
 
@@ -299,8 +299,8 @@ impl JsFormatOptions {
         self.quote_properties = quote_properties;
     }
 
-    pub fn set_trailing_comma(&mut self, trailing_comma: TrailingComma) {
-        self.trailing_comma = trailing_comma;
+    pub fn set_trailing_commas(&mut self, trailing_commas: TrailingCommas) {
+        self.trailing_commas = trailing_commas;
     }
     pub fn set_attribute_position(&mut self, attribute_position: AttributePosition) {
         self.attribute_position = attribute_position;
@@ -338,8 +338,8 @@ impl JsFormatOptions {
         self.source_type
     }
 
-    pub fn trailing_comma(&self) -> TrailingComma {
-        self.trailing_comma
+    pub fn trailing_commas(&self) -> TrailingCommas {
+        self.trailing_commas
     }
 
     pub fn semicolons(&self) -> Semicolons {
@@ -390,7 +390,7 @@ impl fmt::Display for JsFormatOptions {
         writeln!(f, "Quote style: {}", self.quote_style)?;
         writeln!(f, "JSX quote style: {}", self.jsx_quote_style)?;
         writeln!(f, "Quote properties: {}", self.quote_properties)?;
-        writeln!(f, "Trailing comma: {}", self.trailing_comma)?;
+        writeln!(f, "Trailing commas: {}", self.trailing_commas)?;
         writeln!(f, "Semicolons: {}", self.semicolons)?;
         writeln!(f, "Arrow parentheses: {}", self.arrow_parentheses)?;
         writeln!(f, "Bracket spacing: {}", self.bracket_spacing.value())?;
diff --git a/crates/biome_js_formatter/src/context/trailing_comma.rs b/crates/biome_js_formatter/src/context/trailing_commas.rs
similarity index 65%
rename from crates/biome_js_formatter/src/context/trailing_comma.rs
rename to crates/biome_js_formatter/src/context/trailing_commas.rs
index 84bcaf79c671..92227528f3f0 100644
--- a/crates/biome_js_formatter/src/context/trailing_comma.rs
+++ b/crates/biome_js_formatter/src/context/trailing_commas.rs
@@ -7,42 +7,42 @@ use biome_formatter::{Format, FormatResult};
 use std::fmt;
 use std::str::FromStr;
 
-/// This enum is used within formatting functions to print or omit trailing comma.
+/// This enum is used within formatting functions to print or omit trailing commas.
 #[derive(Debug, Copy, Clone)]
-pub(crate) enum FormatTrailingComma {
-    /// Print trailing comma if the option is [TrailingComma::All].
+pub(crate) enum FormatTrailingCommas {
+    /// Print trailing commas if the option is [TrailingCommas::All].
     All,
-    /// Print trailing comma if the option is [TrailingComma::All] or [TrailingComma::Es5].
+    /// Print trailing commas if the option is [TrailingCommas::All] or [TrailingCommas::Es5].
     ES5,
 }
 
-impl FormatTrailingComma {
+impl FormatTrailingCommas {
     /// This function returns corresponding [TrailingSeparator] for [format_separated] function.
     pub fn trailing_separator(&self, options: &JsFormatOptions) -> TrailingSeparator {
-        if options.trailing_comma.is_none() {
+        if options.trailing_commas.is_none() {
             return TrailingSeparator::Omit;
         }
 
         match self {
-            FormatTrailingComma::All => {
-                if options.trailing_comma.is_all() {
+            FormatTrailingCommas::All => {
+                if options.trailing_commas.is_all() {
                     TrailingSeparator::Allowed
                 } else {
                     TrailingSeparator::Omit
                 }
             }
-            FormatTrailingComma::ES5 => TrailingSeparator::Allowed,
+            FormatTrailingCommas::ES5 => TrailingSeparator::Allowed,
         }
     }
 }
 
-impl Format<JsFormatContext> for FormatTrailingComma {
+impl Format<JsFormatContext> for FormatTrailingCommas {
     fn fmt(&self, f: &mut Formatter<JsFormatContext>) -> FormatResult<()> {
-        if f.options().trailing_comma.is_none() {
+        if f.options().trailing_commas.is_none() {
             return Ok(());
         }
 
-        if matches!(self, FormatTrailingComma::ES5) || f.options().trailing_comma().is_all() {
+        if matches!(self, FormatTrailingCommas::ES5) || f.options().trailing_commas().is_all() {
             write!(f, [if_group_breaks(&text(","))])?
         }
 
@@ -57,7 +57,7 @@ impl Format<JsFormatContext> for FormatTrailingComma {
     derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema),
     serde(rename_all = "camelCase")
 )]
-pub enum TrailingComma {
+pub enum TrailingCommas {
     /// Trailing commas wherever possible (including function parameters and calls).
     #[default]
     All,
@@ -67,19 +67,19 @@ pub enum TrailingComma {
     None,
 }
 
-impl TrailingComma {
+impl TrailingCommas {
     pub const fn is_es5(&self) -> bool {
-        matches!(self, TrailingComma::Es5)
+        matches!(self, TrailingCommas::Es5)
     }
     pub const fn is_all(&self) -> bool {
-        matches!(self, TrailingComma::All)
+        matches!(self, TrailingCommas::All)
     }
     pub const fn is_none(&self) -> bool {
-        matches!(self, TrailingComma::None)
+        matches!(self, TrailingCommas::None)
     }
 }
 
-impl FromStr for TrailingComma {
+impl FromStr for TrailingCommas {
     type Err = &'static str;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
@@ -88,17 +88,17 @@ impl FromStr for TrailingComma {
             "all" | "All" => Ok(Self::All),
             "none" | "None" => Ok(Self::None),
             // TODO: replace this error with a diagnostic
-            _ => Err("Value not supported for TrailingComma"),
+            _ => Err("Value not supported for TrailingCommas"),
         }
     }
 }
 
-impl fmt::Display for TrailingComma {
+impl fmt::Display for TrailingCommas {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            TrailingComma::Es5 => std::write!(f, "ES5"),
-            TrailingComma::All => std::write!(f, "All"),
-            TrailingComma::None => std::write!(f, "None"),
+            TrailingCommas::Es5 => std::write!(f, "ES5"),
+            TrailingCommas::All => std::write!(f, "All"),
+            TrailingCommas::None => std::write!(f, "None"),
         }
     }
 }
diff --git a/crates/biome_js_formatter/src/js/expressions/arrow_function_expression.rs b/crates/biome_js_formatter/src/js/expressions/arrow_function_expression.rs
index 4a0b79117ee8..1aaa58835c50 100644
--- a/crates/biome_js_formatter/src/js/expressions/arrow_function_expression.rs
+++ b/crates/biome_js_formatter/src/js/expressions/arrow_function_expression.rs
@@ -5,7 +5,7 @@ use biome_formatter::{
 };
 use std::iter::once;
 
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::js::expressions::call_arguments::GroupedCallArgumentLayout;
 use crate::parentheses::{
     is_binary_like_left_or_right, is_callee, is_conditional_test,
@@ -169,7 +169,7 @@ impl FormatNodeRule<JsArrowFunctionExpression> for FormatJsArrowFunctionExpressi
                                         Ok(())
                                     })),
                                     is_last_call_arg
-                                        .then_some(format_args![FormatTrailingComma::All,]),
+                                        .then_some(format_args![FormatTrailingCommas::All,]),
                                     should_add_soft_line.then_some(format_args![soft_line_break()])
                                 ])
                             ]
@@ -194,7 +194,7 @@ impl FormatNodeRule<JsArrowFunctionExpression> for FormatJsArrowFunctionExpressi
                                         Ok(())
                                     })),
                                     is_last_call_arg
-                                        .then_some(format_args![FormatTrailingComma::All,]),
+                                        .then_some(format_args![FormatTrailingCommas::All,]),
                                     should_add_soft_line.then_some(format_args![soft_line_break()])
                                 ])
                             ]
@@ -265,7 +265,7 @@ fn format_signature(
                             f,
                             [&soft_block_indent(&format_args![
                                 binding.format(),
-                                FormatTrailingComma::All
+                                FormatTrailingCommas::All
                             ])]
                         )?
                     }
diff --git a/crates/biome_js_formatter/src/js/expressions/call_arguments.rs b/crates/biome_js_formatter/src/js/expressions/call_arguments.rs
index 8c21d0eb7926..919ce90b8136 100644
--- a/crates/biome_js_formatter/src/js/expressions/call_arguments.rs
+++ b/crates/biome_js_formatter/src/js/expressions/call_arguments.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::js::bindings::parameters::has_only_simple_parameters;
 use crate::js::declarations::function_declaration::FormatFunctionOptions;
 use crate::js::expressions::arrow_function_expression::{
@@ -732,7 +732,7 @@ impl<'a> Format<JsFormatContext> for FormatAllArgsBrokenOut<'a> {
                     }
 
                     if !is_inside_import {
-                        write!(f, [FormatTrailingComma::All])?;
+                        write!(f, [FormatTrailingCommas::All])?;
                     }
                     Ok(())
                 })),
diff --git a/crates/biome_js_formatter/src/js/lists/array_element_list.rs b/crates/biome_js_formatter/src/js/lists/array_element_list.rs
index 0a7a88e4fafd..ee545668ee57 100644
--- a/crates/biome_js_formatter/src/js/lists/array_element_list.rs
+++ b/crates/biome_js_formatter/src/js/lists/array_element_list.rs
@@ -3,7 +3,7 @@ use biome_formatter::{write, CstFormatContext, FormatRuleWithOptions, GroupId};
 
 use crate::utils::array::write_array_node;
 
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use biome_js_syntax::JsArrayElementList;
 use biome_rowan::{AstNode, AstSeparatedList};
 
@@ -33,7 +33,7 @@ impl FormatRule<JsArrayElementList> for FormatJsArrayElementList {
 
         match layout {
             ArrayLayout::Fill => {
-                let trailing_separator = FormatTrailingComma::ES5.trailing_separator(f.options());
+                let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
 
                 let mut filler = f.fill();
 
diff --git a/crates/biome_js_formatter/src/js/lists/export_named_from_specifier_list.rs b/crates/biome_js_formatter/src/js/lists/export_named_from_specifier_list.rs
index d446c716e1c8..de4b677d2d3f 100644
--- a/crates/biome_js_formatter/src/js/lists/export_named_from_specifier_list.rs
+++ b/crates/biome_js_formatter/src/js/lists/export_named_from_specifier_list.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::prelude::*;
 use biome_js_syntax::JsExportNamedFromSpecifierList;
 
@@ -9,7 +9,7 @@ impl FormatRule<JsExportNamedFromSpecifierList> for FormatJsExportNamedFromSpeci
     type Context = JsFormatContext;
 
     fn fmt(&self, node: &JsExportNamedFromSpecifierList, f: &mut JsFormatter) -> FormatResult<()> {
-        let trailing_separator = FormatTrailingComma::ES5.trailing_separator(f.options());
+        let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
 
         f.join_with(&soft_line_break_or_space())
             .entries(
diff --git a/crates/biome_js_formatter/src/js/lists/export_named_specifier_list.rs b/crates/biome_js_formatter/src/js/lists/export_named_specifier_list.rs
index 3c0cde79676d..1ac8dec6c3aa 100644
--- a/crates/biome_js_formatter/src/js/lists/export_named_specifier_list.rs
+++ b/crates/biome_js_formatter/src/js/lists/export_named_specifier_list.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::prelude::*;
 use biome_js_syntax::JsExportNamedSpecifierList;
 
@@ -9,7 +9,7 @@ impl FormatRule<JsExportNamedSpecifierList> for FormatJsExportNamedSpecifierList
     type Context = JsFormatContext;
 
     fn fmt(&self, node: &JsExportNamedSpecifierList, f: &mut JsFormatter) -> FormatResult<()> {
-        let trailing_separator = FormatTrailingComma::ES5.trailing_separator(f.options());
+        let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
 
         f.join_with(&soft_line_break_or_space())
             .entries(
diff --git a/crates/biome_js_formatter/src/js/lists/import_assertion_entry_list.rs b/crates/biome_js_formatter/src/js/lists/import_assertion_entry_list.rs
index fedbb60c3497..9e437778533b 100644
--- a/crates/biome_js_formatter/src/js/lists/import_assertion_entry_list.rs
+++ b/crates/biome_js_formatter/src/js/lists/import_assertion_entry_list.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::prelude::*;
 use biome_js_syntax::JsImportAssertionEntryList;
 
@@ -9,7 +9,7 @@ impl FormatRule<JsImportAssertionEntryList> for FormatJsImportAssertionEntryList
     type Context = JsFormatContext;
 
     fn fmt(&self, node: &JsImportAssertionEntryList, f: &mut JsFormatter) -> FormatResult<()> {
-        let trailing_separator = FormatTrailingComma::ES5.trailing_separator(f.options());
+        let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
 
         f.join_with(&soft_line_break_or_space())
             .entries(
diff --git a/crates/biome_js_formatter/src/js/lists/named_import_specifier_list.rs b/crates/biome_js_formatter/src/js/lists/named_import_specifier_list.rs
index c044f7b06de6..679600ea69fc 100644
--- a/crates/biome_js_formatter/src/js/lists/named_import_specifier_list.rs
+++ b/crates/biome_js_formatter/src/js/lists/named_import_specifier_list.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::prelude::*;
 use biome_js_syntax::JsNamedImportSpecifierList;
 
@@ -9,7 +9,7 @@ impl FormatRule<JsNamedImportSpecifierList> for FormatJsNamedImportSpecifierList
     type Context = JsFormatContext;
 
     fn fmt(&self, node: &JsNamedImportSpecifierList, f: &mut JsFormatter) -> FormatResult<()> {
-        let trailing_separator = FormatTrailingComma::ES5.trailing_separator(f.options());
+        let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
 
         f.join_with(&soft_line_break_or_space())
             .entries(
diff --git a/crates/biome_js_formatter/src/js/lists/object_assignment_pattern_property_list.rs b/crates/biome_js_formatter/src/js/lists/object_assignment_pattern_property_list.rs
index 5dbcc5ffbbfc..bd8d356e6180 100644
--- a/crates/biome_js_formatter/src/js/lists/object_assignment_pattern_property_list.rs
+++ b/crates/biome_js_formatter/src/js/lists/object_assignment_pattern_property_list.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::prelude::*;
 use biome_js_syntax::{AnyJsObjectAssignmentPatternMember, JsObjectAssignmentPatternPropertyList};
 
@@ -27,7 +27,7 @@ impl FormatRule<JsObjectAssignmentPatternPropertyList>
         let trailing_separator = if has_trailing_rest {
             TrailingSeparator::Disallowed
         } else {
-            FormatTrailingComma::ES5.trailing_separator(f.options())
+            FormatTrailingCommas::ES5.trailing_separator(f.options())
         };
 
         let entries = node
diff --git a/crates/biome_js_formatter/src/js/lists/object_binding_pattern_property_list.rs b/crates/biome_js_formatter/src/js/lists/object_binding_pattern_property_list.rs
index 7daf78a0b857..bb67fc239a7b 100644
--- a/crates/biome_js_formatter/src/js/lists/object_binding_pattern_property_list.rs
+++ b/crates/biome_js_formatter/src/js/lists/object_binding_pattern_property_list.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::prelude::*;
 use biome_js_syntax::{AnyJsObjectBindingPatternMember, JsObjectBindingPatternPropertyList};
 
@@ -25,7 +25,7 @@ impl FormatRule<JsObjectBindingPatternPropertyList> for FormatJsObjectBindingPat
         let trailing_separator = if has_trailing_rest {
             TrailingSeparator::Disallowed
         } else {
-            FormatTrailingComma::ES5.trailing_separator(f.options())
+            FormatTrailingCommas::ES5.trailing_separator(f.options())
         };
 
         let entries = node
diff --git a/crates/biome_js_formatter/src/js/lists/object_member_list.rs b/crates/biome_js_formatter/src/js/lists/object_member_list.rs
index cf6cacb25dc6..0c587efdc429 100644
--- a/crates/biome_js_formatter/src/js/lists/object_member_list.rs
+++ b/crates/biome_js_formatter/src/js/lists/object_member_list.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::prelude::*;
 use biome_js_syntax::JsObjectMemberList;
 use biome_rowan::{AstNode, AstSeparatedList};
@@ -10,7 +10,7 @@ impl FormatRule<JsObjectMemberList> for FormatJsObjectMemberList {
     type Context = JsFormatContext;
 
     fn fmt(&self, node: &JsObjectMemberList, f: &mut JsFormatter) -> FormatResult<()> {
-        let trailing_separator = FormatTrailingComma::ES5.trailing_separator(f.options());
+        let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
 
         let mut join = f.join_nodes_with_soft_line();
 
diff --git a/crates/biome_js_formatter/src/js/lists/parameter_list.rs b/crates/biome_js_formatter/src/js/lists/parameter_list.rs
index 1ee731fd6494..8ed26d20c031 100644
--- a/crates/biome_js_formatter/src/js/lists/parameter_list.rs
+++ b/crates/biome_js_formatter/src/js/lists/parameter_list.rs
@@ -1,7 +1,7 @@
 use crate::js::bindings::parameters::ParameterLayout;
 use crate::prelude::*;
 
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use biome_js_syntax::parameter_ext::{AnyJsParameterList, AnyParameter};
 use biome_js_syntax::{AnyJsConstructorParameter, AnyJsParameter, JsParameterList};
 
@@ -56,7 +56,7 @@ impl Format<JsFormatContext> for FormatJsAnyParameterList<'_> {
                 let trailing_separator = if has_trailing_rest {
                     TrailingSeparator::Disallowed
                 } else {
-                    FormatTrailingComma::All.trailing_separator(f.options())
+                    FormatTrailingCommas::All.trailing_separator(f.options())
                 };
 
                 let has_modifiers = self.list.iter().any(|node| {
diff --git a/crates/biome_js_formatter/src/ts/lists/enum_member_list.rs b/crates/biome_js_formatter/src/ts/lists/enum_member_list.rs
index c1abd43ba213..a1fa947ef525 100644
--- a/crates/biome_js_formatter/src/ts/lists/enum_member_list.rs
+++ b/crates/biome_js_formatter/src/ts/lists/enum_member_list.rs
@@ -1,6 +1,6 @@
 use crate::prelude::*;
 
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use biome_js_syntax::TsEnumMemberList;
 
 #[derive(Debug, Clone, Default)]
@@ -10,7 +10,7 @@ impl FormatRule<TsEnumMemberList> for FormatTsEnumMemberList {
     type Context = JsFormatContext;
 
     fn fmt(&self, node: &TsEnumMemberList, f: &mut JsFormatter) -> FormatResult<()> {
-        let trailing_separator = FormatTrailingComma::ES5.trailing_separator(f.options());
+        let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
         let mut joiner = f.join_nodes_with_soft_line();
 
         for variant in node
diff --git a/crates/biome_js_formatter/src/ts/lists/tuple_type_element_list.rs b/crates/biome_js_formatter/src/ts/lists/tuple_type_element_list.rs
index 4fa932b2bb3b..6c20edecc346 100644
--- a/crates/biome_js_formatter/src/ts/lists/tuple_type_element_list.rs
+++ b/crates/biome_js_formatter/src/ts/lists/tuple_type_element_list.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::prelude::*;
 use biome_js_syntax::TsTupleTypeElementList;
 
@@ -9,7 +9,7 @@ impl FormatRule<TsTupleTypeElementList> for FormatTsTupleTypeElementList {
     type Context = JsFormatContext;
 
     fn fmt(&self, node: &TsTupleTypeElementList, f: &mut JsFormatter) -> FormatResult<()> {
-        let trailing_separator = FormatTrailingComma::ES5.trailing_separator(f.options());
+        let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
 
         f.join_with(&soft_line_break_or_space())
             .entries(
diff --git a/crates/biome_js_formatter/src/ts/lists/type_parameter_list.rs b/crates/biome_js_formatter/src/ts/lists/type_parameter_list.rs
index d2d780b3c8bb..bbd0b2a4e3b5 100644
--- a/crates/biome_js_formatter/src/ts/lists/type_parameter_list.rs
+++ b/crates/biome_js_formatter/src/ts/lists/type_parameter_list.rs
@@ -1,4 +1,4 @@
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::prelude::*;
 use biome_js_syntax::{JsSyntaxKind, TsTypeParameterList};
 use biome_rowan::{AstSeparatedList, SyntaxNodeOptionExt};
@@ -26,7 +26,7 @@ impl FormatRule<TsTypeParameterList> for FormatTsTypeParameterList {
         {
             TrailingSeparator::Mandatory
         } else {
-            FormatTrailingComma::ES5.trailing_separator(f.options())
+            FormatTrailingCommas::ES5.trailing_separator(f.options())
         };
 
         f.join_with(&soft_line_break_or_space())
diff --git a/crates/biome_js_formatter/src/utils/array.rs b/crates/biome_js_formatter/src/utils/array.rs
index 4da326379cba..4a69997dc7d8 100644
--- a/crates/biome_js_formatter/src/utils/array.rs
+++ b/crates/biome_js_formatter/src/utils/array.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;
 use crate::AsFormat;
 
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use biome_formatter::write;
 use biome_js_syntax::{
     AnyJsArrayAssignmentPatternElement, AnyJsArrayBindingPatternElement, AnyJsArrayElement,
@@ -15,7 +15,7 @@ where
     N: AstSeparatedList<Language = JsLanguage, Node = I>,
     I: ArrayNodeElement + AsFormat<JsFormatContext>,
 {
-    let trailing_separator = FormatTrailingComma::ES5.trailing_separator(f.options());
+    let trailing_separator = FormatTrailingCommas::ES5.trailing_separator(f.options());
 
     // Specifically do not use format_separated as arrays need separators
     // inserted after holes regardless of the formatting since this makes a
@@ -57,7 +57,7 @@ where
                         }
                     }
                 } else {
-                    write!(f, [FormatTrailingComma::ES5])?;
+                    write!(f, [FormatTrailingCommas::ES5])?;
                 };
 
                 Ok(())
diff --git a/crates/biome_js_formatter/src/utils/mod.rs b/crates/biome_js_formatter/src/utils/mod.rs
index 860751c15b4b..b4363a48fe9f 100644
--- a/crates/biome_js_formatter/src/utils/mod.rs
+++ b/crates/biome_js_formatter/src/utils/mod.rs
@@ -18,7 +18,7 @@ mod quickcheck_utils;
 pub(crate) mod test_each_template;
 mod typescript;
 
-use crate::context::trailing_comma::FormatTrailingComma;
+use crate::context::trailing_commas::FormatTrailingCommas;
 use crate::context::Semicolons;
 use crate::parentheses::is_callee;
 pub(crate) use crate::parentheses::resolve_left_most_expression;
@@ -308,7 +308,7 @@ where
         let last = iterator.peek().is_none();
 
         if last {
-            join_with.entry(&format_args![&element, FormatTrailingComma::All]);
+            join_with.entry(&format_args![&element, FormatTrailingCommas::All]);
         } else {
             join_with.entry(&element);
         }
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/array_nested.js.snap b/crates/biome_js_formatter/tests/specs/js/module/array/array_nested.js.snap
index 2d5af62fdede..c58dedc80864 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/array/array_nested.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/array/array_nested.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/array/array_nested.js
 ---
-
 # Input
 
 ```js
@@ -65,7 +64,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -132,5 +131,3 @@ let o1 = [
 	{ a, b, c },
 ];
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/binding_pattern.js.snap b/crates/biome_js_formatter/tests/specs/js/module/array/binding_pattern.js.snap
index f447d2f1f8e0..0b4f6726d3dc 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/array/binding_pattern.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/array/binding_pattern.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/array/binding_pattern.js
 ---
-
 # Input
 
 ```js
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -44,5 +43,3 @@ let [
 	...cccccccccccccccccccccccccccccc
 ] = f;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/empty_lines.js.snap b/crates/biome_js_formatter/tests/specs/js/module/array/empty_lines.js.snap
index 7ccad03175fa..da3d2a70874d 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/array/empty_lines.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/array/empty_lines.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/array/empty_lines.js
 ---
-
 # Input
 
 ```js
@@ -36,7 +35,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -53,5 +52,3 @@ let a = [
 	4,
 ];
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/spaces.js.snap b/crates/biome_js_formatter/tests/specs/js/module/array/spaces.js.snap
index 6f8bb4892186..4aef4655e44a 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/array/spaces.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/array/spaces.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/array/spaces.js
 ---
-
 # Input
 
 ```js
@@ -29,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -44,5 +43,3 @@ let c = [, , 1];
 let d = [, , 1, 1];
 let e = [2, 2, 1, 3];
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/spread.js.snap b/crates/biome_js_formatter/tests/specs/js/module/array/spread.js.snap
index ee7ec2f8b0c5..cc59224f4ad3 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/array/spread.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/array/spread.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/array/spread.js
 ---
-
 # Input
 
 ```js
@@ -29,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -47,5 +46,3 @@ let a = [
 	...cccccccccccccccccccccccccccccc,
 ];
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/es5/array_trailing_comma.js b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/es5/array_trailing_commas.js
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/es5/array_trailing_comma.js
rename to crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/es5/array_trailing_commas.js
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/es5/array_trailing_comma.js.snap b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/es5/array_trailing_commas.js.snap
similarity index 97%
rename from crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/es5/array_trailing_comma.js.snap
rename to crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/es5/array_trailing_commas.js.snap
index 70b692d54051..b1b90019c625 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/es5/array_trailing_comma.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/es5/array_trailing_commas.js.snap
@@ -33,7 +33,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -66,7 +66,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: ES5
+Trailing commas: ES5
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/none/options.json b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/es5/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/none/options.json
rename to crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/es5/options.json
index 12309404a928..7975678923cd 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/none/options.json
+++ b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/es5/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "none"
+      "trailingCommas": "es5"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/none/array_trailing_comma.js b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/none/array_trailing_commas.js
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/none/array_trailing_comma.js
rename to crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/none/array_trailing_commas.js
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/none/array_trailing_comma.js.snap b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/none/array_trailing_commas.js.snap
similarity index 97%
rename from crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/none/array_trailing_comma.js.snap
rename to crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/none/array_trailing_commas.js.snap
index 50f9a76b22e5..c06990538a50 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/none/array_trailing_comma.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/none/array_trailing_commas.js.snap
@@ -33,7 +33,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -66,7 +66,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: None
+Trailing commas: None
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/none/options.json b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/none/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/none/options.json
rename to crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/none/options.json
index 12309404a928..6f38a3fd5972 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/none/options.json
+++ b/crates/biome_js_formatter/tests/specs/js/module/array/trailing-commas/none/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "none"
+      "trailingCommas": "none"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow-comments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow-comments.js.snap
index 3362cb1d9bf4..9f8c510c189b 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow-comments.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow-comments.js.snap
@@ -44,7 +44,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -85,7 +85,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_chain_comments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_chain_comments.js.snap
index 7a6ee0053896..0ff38e4fa4fa 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_chain_comments.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_chain_comments.js.snap
@@ -32,7 +32,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -69,7 +69,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_function.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_function.js.snap
index 02ab31069a6f..8b4cbe9958cf 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_function.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_function.js.snap
@@ -29,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -60,7 +60,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_nested.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_nested.js.snap
index 7ecd052f03d3..12ef1e11110d 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_nested.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_nested.js.snap
@@ -50,7 +50,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -97,7 +97,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_test_callback.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_test_callback.js.snap
index bc6dcffb5f1b..2cbbe22f5cb6 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_test_callback.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/arrow_test_callback.js.snap
@@ -27,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -57,7 +57,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/assignment_binding_line_break.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/assignment_binding_line_break.js.snap
index 15ca087cd021..c17eb8753200 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/assignment_binding_line_break.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/assignment_binding_line_break.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -60,7 +60,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/call.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/call.js.snap
index 78f94a0ad2fe..ebbc54288eaf 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/call.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/call.js.snap
@@ -67,7 +67,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -141,7 +141,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/curried_indents.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/curried_indents.js.snap
index 4b95b9b2e0ff..709cafc2ff68 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/curried_indents.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/curried_indents.js.snap
@@ -66,7 +66,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -134,7 +134,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/currying.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/currying.js.snap
index 0bfda379a58b..18ea7adc6af9 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/currying.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/currying.js.snap
@@ -73,7 +73,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -164,7 +164,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/arrow/params.js.snap b/crates/biome_js_formatter/tests/specs/js/module/arrow/params.js.snap
index 1b2f87f08bf0..4a5e74d4348f 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/arrow/params.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/arrow/params.js.snap
@@ -349,7 +349,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -677,7 +677,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/assignment/array-assignment-holes.js.snap b/crates/biome_js_formatter/tests/specs/js/module/assignment/array-assignment-holes.js.snap
index 2c0077e304d2..e2bc078ccd8a 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/assignment/array-assignment-holes.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/assignment/array-assignment-holes.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/assignment/array-assignment-holes.js
 ---
-
 # Input
 
 ```js
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -38,5 +37,3 @@ Attribute Position: Auto
 let a, b;
 [a, /*empty*/ ,] = b;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/assignment/assignment.js.snap b/crates/biome_js_formatter/tests/specs/js/module/assignment/assignment.js.snap
index 1c7ee99beffd..997e1284c8df 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/assignment/assignment.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/assignment/assignment.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/assignment/assignment.js
 ---
-
 # Input
 
 ```js
@@ -193,7 +192,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -457,5 +456,3 @@ export const MSG_WITHOUT_ESCAPE_CHARACTER_TEST =
    64: 	"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
    66: 	"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/assignment/assignment_ignore.js.snap b/crates/biome_js_formatter/tests/specs/js/module/assignment/assignment_ignore.js.snap
index 0f3ae7c95237..8dd9a44cc486 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/assignment/assignment_ignore.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/assignment/assignment_ignore.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/assignment/assignment_ignore.js
 ---
-
 # Input
 
 ```js
@@ -28,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -42,5 +41,3 @@ let {
 	someProperty:    alias,
 } = { someProperty: 20 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/binding/array-binding-holes.js.snap b/crates/biome_js_formatter/tests/specs/js/module/binding/array-binding-holes.js.snap
index f880aba07c90..4e09cbdf4aa5 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/binding/array-binding-holes.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/binding/array-binding-holes.js.snap
@@ -24,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -46,7 +46,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/js/module/binding/array_binding.js.snap b/crates/biome_js_formatter/tests/specs/js/module/binding/array_binding.js.snap
index 94c7aad37321..1dec004baf6a 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/binding/array_binding.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/binding/array_binding.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -53,7 +53,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/js/module/binding/identifier_binding.js.snap b/crates/biome_js_formatter/tests/specs/js/module/binding/identifier_binding.js.snap
index 94e03f8f8213..22a3474ce8fc 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/binding/identifier_binding.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/binding/identifier_binding.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -51,7 +51,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/js/module/binding/nested_bindings.js.snap b/crates/biome_js_formatter/tests/specs/js/module/binding/nested_bindings.js.snap
index 08d9948c1d59..9b6f61765c60 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/binding/nested_bindings.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/binding/nested_bindings.js.snap
@@ -74,7 +74,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -193,7 +193,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/js/module/binding/object_binding.js.snap b/crates/biome_js_formatter/tests/specs/js/module/binding/object_binding.js.snap
index 770532ceba83..fdf343bdeb21 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/binding/object_binding.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/binding/object_binding.js.snap
@@ -27,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -61,7 +61,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/js/module/bom_character.js.snap b/crates/biome_js_formatter/tests/specs/js/module/bom_character.js.snap
index a6c7922808f5..4daaf14a9c19 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/bom_character.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/bom_character.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/bom_character.js
 ---
-
 # Input
 
 ```js
@@ -24,7 +23,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -35,5 +34,3 @@ Attribute Position: Auto
 ```js
 function foo() {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/call/call_chain.js.snap b/crates/biome_js_formatter/tests/specs/js/module/call/call_chain.js.snap
index c18351f62f6e..b8b93cdc3f93 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/call/call_chain.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/call/call_chain.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/call/call_chain.js
 ---
-
 # Input
 
 ```js
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -38,5 +37,3 @@ Attribute Position: Auto
 // https://github.com/biomejs/biome/issues/1039
 s(/🚀🚀/).s().s();
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/call/simple_arguments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/call/simple_arguments.js.snap
index 9be8fc7bb9fb..4e2346dc9fb7 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/call/simple_arguments.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/call/simple_arguments.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/call/simple_arguments.js
 ---
-
 # Input
 
 ```js
@@ -108,7 +107,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -195,5 +194,3 @@ foo(() => {
 	foo;
 }, [Math.floor(1 + 2)]);
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/call_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/call_expression.js.snap
index 3a6aa90742f9..0c1f2d667a7d 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/call_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/call_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/call_expression.js
 ---
-
 # Input
 
 ```js
@@ -93,7 +92,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -174,5 +173,3 @@ aLongFunctionName(({ parameter1, parameter2, parameter3, parameter4, and }) => {
 	const a = 1;
 });
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/class/class.js.snap b/crates/biome_js_formatter/tests/specs/js/module/class/class.js.snap
index 34e0434aa714..d798a9bd3ca8 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/class/class.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/class/class.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/class/class.js
 ---
-
 # Input
 
 ```js
@@ -94,7 +93,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -165,5 +164,3 @@ export class Task {
 	}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/class/class_comments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/class/class_comments.js.snap
index 16fd5e9b42cb..b16b99360f7b 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/class/class_comments.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/class/class_comments.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/class/class_comments.js
 ---
-
 # Input
 
 ```js
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -48,5 +47,3 @@ class A extends B {
 	// trailing comment
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/class/private_method.js.snap b/crates/biome_js_formatter/tests/specs/js/module/class/private_method.js.snap
index 54d3366ebf92..51f43a20105e 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/class/private_method.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/class/private_method.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/class/private_method.js
 ---
-
 # Input
 
 ```js
@@ -40,7 +39,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -70,5 +69,3 @@ class Foo {
 	}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/comments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/comments.js.snap
index a290ae8aeea7..eea76cf22b58 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/comments.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/comments.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/comments.js
 ---
-
 # Input
 
 ```js
@@ -110,7 +109,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -211,5 +210,3 @@ function foo() {
 	// empty statement leading comments
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/comments/import_exports.js.snap b/crates/biome_js_formatter/tests/specs/js/module/comments/import_exports.js.snap
index 6d81103e3f91..b3c25344f110 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/comments/import_exports.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/comments/import_exports.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/comments/import_exports.js
 ---
-
 # Input
 
 ```js
@@ -38,7 +37,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -63,5 +62,3 @@ import {
 	// comment here should not get moved
 } from "foo";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/comments/nested_comments/nested_comments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/comments/nested_comments/nested_comments.js.snap
index db65b784a921..0e1e99ce2cde 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/comments/nested_comments/nested_comments.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/comments/nested_comments/nested_comments.js.snap
@@ -30,7 +30,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -61,7 +61,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/declarations/variable_declaration.js.snap b/crates/biome_js_formatter/tests/specs/js/module/declarations/variable_declaration.js.snap
index 983b7768e356..279f5f2964ca 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/declarations/variable_declaration.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/declarations/variable_declaration.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/declarations/variable_declaration.js
 ---
-
 # Input
 
 ```js
@@ -289,7 +288,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -816,5 +815,3 @@ const a
   442: var loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong1 =
   444: let loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong2 =
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_call_decorator.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_call_decorator.js.snap
index 568b6c2b8792..61f3452a1618 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_call_decorator.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_call_decorator.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/class_members_call_decorator.js
 ---
-
 # Input
 
 ```js
@@ -116,7 +115,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -243,5 +242,3 @@ class Foo {
 	set setter(val) {}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_mixed.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_mixed.js.snap
index 5a76dfd73942..f9212d5726b6 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_mixed.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_mixed.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/class_members_mixed.js
 ---
-
 # Input
 
 ```js
@@ -116,7 +115,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -241,5 +240,3 @@ class Foo {
 	set setter(val) {}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_simple.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_simple.js.snap
index 93b65949a59e..5fa04bb7f95a 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_simple.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_members_simple.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/class_members_simple.js
 ---
-
 # Input
 
 ```js
@@ -116,7 +115,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -231,5 +230,3 @@ class Foo {
 	set setter(val) {}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_simple.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_simple.js.snap
index 7cba76ab7f89..9975a56cf3b8 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_simple.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_simple.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/class_simple.js
 ---
-
 # Input
 
 ```js
@@ -72,7 +71,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -161,5 +160,3 @@ export
 @dec4
 class My {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_simple_call_decorator.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_simple_call_decorator.js.snap
index 8e7540bb391f..afc75352263f 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/class_simple_call_decorator.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/class_simple_call_decorator.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/class_simple_call_decorator.js
 ---
-
 # Input
 
 ```js
@@ -72,7 +71,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -161,5 +160,3 @@ export
 @decorator4.method(value)
 class Foo {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_1.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_1.js.snap
index 519d2882b143..2c9f4a1a5e5d 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_1.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_1.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/export_default_1.js
 ---
-
 # Input
 
 ```js
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -37,5 +36,3 @@ Attribute Position: Auto
 @dec
 export default class Foo {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_2.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_2.js.snap
index d8ccbfd9b128..74d0245dfbb8 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_2.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_2.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/export_default_2.js
 ---
-
 # Input
 
 ```js
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -38,5 +37,3 @@ export default
 @dec
 class Foo {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_3.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_3.js.snap
index 6406d753be06..1e98cab550f3 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_3.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_3.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/export_default_3.js
 ---
-
 # Input
 
 ```js
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -38,5 +37,3 @@ Attribute Position: Auto
 @dec2
 export default class Foo {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_4.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_4.js.snap
index e7ce3e60bc37..054366bf61d7 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_4.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/export_default_4.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/export_default_4.js
 ---
-
 # Input
 
 ```js
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -40,5 +39,3 @@ Attribute Position: Auto
 @dec4
 export default class Foo {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/expression.js.snap
index c9af01042e3a..6642efe75b42 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/expression.js
 ---
-
 # Input
 
 ```js
@@ -45,7 +44,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -108,5 +107,3 @@ class Foo extends (
 	class {}
 ) {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/decorators/multiline.js.snap b/crates/biome_js_formatter/tests/specs/js/module/decorators/multiline.js.snap
index abdef0d5cb94..c83d09662572 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/decorators/multiline.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/decorators/multiline.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/decorators/multiline.js
 ---
-
 # Input
 
 ```js
@@ -40,7 +39,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -61,5 +60,3 @@ class Foo {
 	@decorator({}) method() {}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/each/each.js.snap b/crates/biome_js_formatter/tests/specs/js/module/each/each.js.snap
index 6b74bf224ad8..8a87cb0ac943 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/each/each.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/each/each.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/each/each.js
 ---
-
 # Input
 
 ```js
@@ -90,7 +89,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -178,5 +177,3 @@ ${2} | ${1} | ${3}`;
    54: 	${1} | ${[{ start: 5, end: 15 }]}                        | ${[1, 2, 3, 4, 5, 6, 7, 8]}
    55: 	${1} | ${[{ start: 5, end: 15 }]}                        | ${["test", "string", "for", "prettier"]}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/bracket-spacing/export_bracket_spacing.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/bracket-spacing/export_bracket_spacing.js.snap
index 97bc8dbbb0f4..6118838cee63 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/bracket-spacing/export_bracket_spacing.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/bracket-spacing/export_bracket_spacing.js.snap
@@ -42,7 +42,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -92,7 +92,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/class_clause.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/class_clause.js.snap
index b2e86c48342d..5fec2a5fbbcb 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/class_clause.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/class_clause.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/export/class_clause.js
 ---
-
 # Input
 
 ```js
@@ -33,7 +32,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -50,5 +49,3 @@ export class A {
 
 export default class B {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/expression_clause.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/expression_clause.js.snap
index 16fcbb26793f..3e1e582dad23 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/expression_clause.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/expression_clause.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/export/expression_clause.js
 ---
-
 # Input
 
 ```js
@@ -24,7 +23,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -35,5 +34,3 @@ Attribute Position: Auto
 ```js
 export default 1 - 43;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/from_clause.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/from_clause.js.snap
index 22234849f49e..dfd84da56fda 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/from_clause.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/from_clause.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/export/from_clause.js
 ---
-
 # Input
 
 ```js
@@ -28,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -51,5 +50,3 @@ export * as something_bad_will_happen from "something_bad_might_not_happen" asse
 ```
     5: export * as something_bad_will_happen from "something_bad_might_not_happen" assert {
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/function_clause.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/function_clause.js.snap
index db3f6728d743..62602d678e93 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/function_clause.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/function_clause.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/export/function_clause.js
 ---
-
 # Input
 
 ```js
@@ -32,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -45,5 +44,3 @@ export function f() {}
 
 export default function ff() {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/named_clause.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/named_clause.js.snap
index c6955552e3c2..104afc234857 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/named_clause.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/named_clause.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/export/named_clause.js
 ---
-
 # Input
 
 ```js
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -46,5 +45,3 @@ export {
 	buzz as bar,
 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/named_from_clause.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/named_from_clause.js.snap
index 5abc9825bb1f..d85085adfdf6 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/named_from_clause.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/named_from_clause.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/export/named_from_clause.js
 ---
-
 # Input
 
 ```js
@@ -43,7 +42,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -82,5 +81,3 @@ export { a as b } from "looooooooooooooooooooooooooooooooooooooooooooooooooooooo
    15: export { loooooooooooooooooooooooooooooooooooooooooooooooooong } from "loooooooooooooooooooooooooooooooooooooooooooooong";
    22: export { a as b } from "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/es5/export_trailing_comma.js b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/es5/export_trailing_commas.js
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/es5/export_trailing_comma.js
rename to crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/es5/export_trailing_commas.js
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/es5/export_trailing_comma.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/es5/export_trailing_commas.js.snap
similarity index 90%
rename from crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/es5/export_trailing_comma.js.snap
rename to crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/es5/export_trailing_commas.js.snap
index af8c5e9dce08..007b3e99591b 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/es5/export_trailing_comma.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/es5/export_trailing_commas.js.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: js/module/export/trailing-comma/es5/export_trailing_comma.js
+info: js/module/export/trailing-commas/es5/export_trailing_commas.js
 ---
 # Input
 
@@ -28,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -54,7 +54,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: ES5
+Trailing commas: ES5
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/es5/options.json b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/es5/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/es5/options.json
rename to crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/es5/options.json
index 697e2f4f5ca1..7975678923cd 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/es5/options.json
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/es5/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "es5"
+      "trailingCommas": "es5"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/none/export_trailing_comma.js b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/none/export_trailing_commas.js
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/none/export_trailing_comma.js
rename to crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/none/export_trailing_commas.js
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/none/export_trailing_comma.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/none/export_trailing_commas.js.snap
similarity index 90%
rename from crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/none/export_trailing_comma.js.snap
rename to crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/none/export_trailing_commas.js.snap
index a9e287bbbe01..ab69eb2e1b0e 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/trailing-comma/none/export_trailing_comma.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/none/export_trailing_commas.js.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: js/module/export/trailing-comma/none/export_trailing_comma.js
+info: js/module/export/trailing-commas/none/export_trailing_commas.js
 ---
 # Input
 
@@ -28,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -54,7 +54,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: None
+Trailing commas: None
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/es5/options.json b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/none/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/es5/options.json
rename to crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/none/options.json
index 697e2f4f5ca1..6f38a3fd5972 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/array/trailing-comma/es5/options.json
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/trailing-commas/none/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "es5"
+      "trailingCommas": "none"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/js/module/export/variable_declaration.js.snap b/crates/biome_js_formatter/tests/specs/js/module/export/variable_declaration.js.snap
index 23b560db88d1..ff2795342471 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/export/variable_declaration.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/export/variable_declaration.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/export/variable_declaration.js
 ---
-
 # Input
 
 ```js
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -41,5 +40,3 @@ export const foofoofoofoofoofoofoo = "ahah",
 	barbarbarbarbarbarbar = {},
 	loremloremloremloremlorem = [];
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/binary_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/binary_expression.js.snap
index b8bc244c7681..2d0e5ba2dcb5 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/binary_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/binary_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/binary_expression.js
 ---
-
 # Input
 
 ```js
@@ -58,7 +57,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -102,5 +101,3 @@ a +
 	// rome-ignore format: Test formatting ignored binary expressions
 	-   4_444_444;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/binary_range_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/binary_range_expression.js.snap
index b81a1192fddf..84b813c67634 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/binary_range_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/binary_range_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/binary_range_expression.js
 ---
-
 # Input
 
 ```js
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -36,5 +35,3 @@ Attribute Position: Auto
 ```js
 1 + 2 + 3 + 4 + 5;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/binaryish_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/binaryish_expression.js.snap
index d6ef97b9573d..b6607acc385e 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/binaryish_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/binaryish_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/binaryish_expression.js
 ---
-
 # Input
 
 ```js
@@ -24,7 +23,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -36,5 +35,3 @@ Attribute Position: Auto
 2 > (4 + ((4 * 24) % 3)) << 23 instanceof Number in data ||
 	(a in status instanceof String + 15 && foo && bar && lorem instanceof String);
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/computed-member-expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/computed-member-expression.js.snap
index 7f6592819b5f..143606b81cdc 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/computed-member-expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/computed-member-expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/computed-member-expression.js
 ---
-
 # Input
 
 ```js
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -36,5 +35,3 @@ Attribute Position: Auto
 ```js
 a["test"][5 + 5][call()];
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/conditional_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/conditional_expression.js.snap
index 10db03fd4c29..0c5120ebfb67 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/conditional_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/conditional_expression.js.snap
@@ -32,7 +32,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/import_meta_expression/import_meta_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/import_meta_expression/import_meta_expression.js.snap
index 20e6b6e0c2d7..3dd9ad78f805 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/import_meta_expression/import_meta_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/import_meta_expression/import_meta_expression.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -57,7 +57,7 @@ Line width: 120
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/literal_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/literal_expression.js.snap
index 06f5df2ceb16..1541c7e46e60 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/literal_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/literal_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/literal_expression.js
 ---
-
 # Input
 
 ```js
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -47,5 +46,3 @@ false;
 null;
 /[/]\/\u0aBc/gim;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/logical_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/logical_expression.js.snap
index 5fb1a5ed8d9a..77f87b5947b2 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/logical_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/logical_expression.js.snap
@@ -135,7 +135,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/complex_arguments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/complex_arguments.js.snap
index 5426d4f468ec..a515f7866d4a 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/complex_arguments.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/complex_arguments.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/member-chain/complex_arguments.js
 ---
-
 # Input
 
 ```js
@@ -29,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -42,5 +41,3 @@ client.execute(
 	Post.selectAll().where(Post.id.eq(42)).where(Post.published.eq(true)),
 );
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/computed.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/computed.js.snap
index fd573e130702..d6ba8fb1d752 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/computed.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/computed.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/member-chain/computed.js
 ---
-
 # Input
 
 ```js
@@ -29,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -45,5 +44,3 @@ nock(/test/)
 		foo: "bar",
 	});
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/inline-merge.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/inline-merge.js.snap
index be5a34d0d59a..b7b2b8408e94 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/inline-merge.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/inline-merge.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/member-chain/inline-merge.js
 ---
-
 # Input
 
 ```js
@@ -36,7 +35,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -57,5 +56,3 @@ Object.keys(
 	// ...
 });
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/multi_line.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/multi_line.js.snap
index e3a5d8c20e6d..7c3f0e3ee78e 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/multi_line.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/multi_line.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/member-chain/multi_line.js
 ---
-
 # Input
 
 ```js
@@ -97,7 +96,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -144,5 +143,3 @@ foo.bar
 
 	.foo();
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/static_member_regex.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/static_member_regex.js.snap
index 660d7fe07d65..8b8b6e06e900 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/static_member_regex.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/member-chain/static_member_regex.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/member-chain/static_member_regex.js
 ---
-
 # Input
 
 ```js
@@ -48,7 +47,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -87,5 +86,3 @@ const a = {
 	),
 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/nested_conditional_expression/nested_conditional_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/nested_conditional_expression/nested_conditional_expression.js.snap
index 57e10ef8907e..015f1a85d3ac 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/nested_conditional_expression/nested_conditional_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/nested_conditional_expression/nested_conditional_expression.js.snap
@@ -35,7 +35,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -69,7 +69,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/new_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/new_expression.js.snap
index da7b8ce666ff..d13ca3761d63 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/new_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/new_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/new_expression.js
 ---
-
 # Input
 
 ```js
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -44,5 +43,3 @@ new c(
 	cccccccccccccccccccccccccccccc,
 );
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/post_update_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/post_update_expression.js.snap
index 1569b61eb056..8efc8145d377 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/post_update_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/post_update_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/post_update_expression.js
 ---
-
 # Input
 
 ```js
@@ -28,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -42,5 +41,3 @@ y--;
 x = y++;
 x = y--;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/pre_update_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/pre_update_expression.js.snap
index 69ca5d6ca3b8..00d5e880c4f3 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/pre_update_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/pre_update_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/pre_update_expression.js
 ---
-
 # Input
 
 ```js
@@ -28,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -42,5 +41,3 @@ Attribute Position: Auto
 x = ++y;
 x = --y;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/sequence_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/sequence_expression.js.snap
index 666498b6a6be..ad1772c6a44f 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/sequence_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/sequence_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/sequence_expression.js
 ---
-
 # Input
 
 ```js
@@ -57,7 +56,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -121,5 +120,3 @@ aLongIdentifierName,
 	aLongIdentifierName,
 	aLongIdentifierName;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/static_member_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/static_member_expression.js.snap
index 59c553f68880..fc0169856f75 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/static_member_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/static_member_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/static_member_expression.js
 ---
-
 # Input
 
 ```js
@@ -44,7 +43,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -85,5 +84,3 @@ some.member.with.
 	// rome-ignore format: Verify that formatting calls into right.format()
 	rather.hard.to.test.because.name.doesnt.format.being.ignored;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/this_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/this_expression.js.snap
index 55de50fbd9ba..0aa189a05bb0 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/this_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/this_expression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/this_expression.js
 ---
-
 # Input
 
 ```js
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -36,5 +35,3 @@ Attribute Position: Auto
 ```js
 this;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/unary_expression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/unary_expression.js.snap
index 2d263a5a4f9e..9c7c51623dec 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/unary_expression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/unary_expression.js.snap
@@ -1,9 +1,7 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-assertion_line: 212
 info: js/module/expression/unary_expression.js
 ---
-
 # Input
 
 ```js
@@ -42,7 +40,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -84,5 +82,3 @@ x =
    19: 	~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
    21: 	!aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/expression/unary_expression_verbatim_argument.js.snap b/crates/biome_js_formatter/tests/specs/js/module/expression/unary_expression_verbatim_argument.js.snap
index a3d19eaba18c..a0ce39078cbb 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/expression/unary_expression_verbatim_argument.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/expression/unary_expression_verbatim_argument.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/expression/unary_expression_verbatim_argument.js
 ---
-
 # Input
 
 ```js
@@ -32,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -48,5 +47,3 @@ Attribute Position: Auto
 	a && b
 );
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/function/function.js.snap b/crates/biome_js_formatter/tests/specs/js/module/function/function.js.snap
index 22d9e5865553..922a2c74eedd 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/function/function.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/function/function.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/function/function.js
 ---
-
 # Input
 
 ```js
@@ -56,7 +55,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -96,5 +95,3 @@ function directives() {
 	"use strict";
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/function/function_args.js.snap b/crates/biome_js_formatter/tests/specs/js/module/function/function_args.js.snap
index cdc25b11a6ad..9189ddd98184 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/function/function_args.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/function/function_args.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/function/function_args.js
 ---
-
 # Input
 
 ```js
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -47,5 +46,3 @@ function foo(
 	return "nothing";
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js.snap
index 448caac910a9..23235876012d 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/function/function_comments.js
 ---
-
 # Input
 
 ```js
@@ -63,7 +62,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -108,5 +107,3 @@ function h() /* a */ {
 	a;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/ident.js.snap b/crates/biome_js_formatter/tests/specs/js/module/ident.js.snap
index 1eb1a3e34a1b..a78df2ee5eaf 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/ident.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/ident.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/ident.js
 ---
-
 # Input
 
 ```js
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -36,5 +35,3 @@ Attribute Position: Auto
 ```js
 x;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/bare_import.js.snap b/crates/biome_js_formatter/tests/specs/js/module/import/bare_import.js.snap
index 8a9335482b4b..79dbcd225e22 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/bare_import.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/bare_import.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/import/bare_import.js
 ---
-
 # Input
 
 ```js
@@ -47,7 +46,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -85,5 +84,3 @@ import "very_long_import_very_long_import_very" assert {
     2: import "very_long_import_very_long_import_very_long_import_very_long_import_very_long_import_very_long" assert {
    20: 	"typetypetypetypetypetypetypetypetypetypetype": /****/ "typetypetypetypetypetypetypetypetypetypetypetypetypetype",
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/bracket-spacing/import_bracket_spacing.js.snap b/crates/biome_js_formatter/tests/specs/js/module/import/bracket-spacing/import_bracket_spacing.js.snap
index 55a8adcaf0ba..7616bb243af2 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/bracket-spacing/import_bracket_spacing.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/bracket-spacing/import_bracket_spacing.js.snap
@@ -52,7 +52,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -100,7 +100,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/default_import.js.snap b/crates/biome_js_formatter/tests/specs/js/module/import/default_import.js.snap
index 6632de107d1c..f8ba1ca6e839 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/default_import.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/default_import.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/import/default_import.js
 ---
-
 # Input
 
 ```js
@@ -35,7 +34,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -57,5 +56,3 @@ import foo2 from "foo.json" assert {
 };
 import a, * as b from "foo";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/import_call.js.snap b/crates/biome_js_formatter/tests/specs/js/module/import/import_call.js.snap
index bc16f3b84d15..5e3b9c3b45e5 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/import_call.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/import_call.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/import/import_call.js
 ---
-
 # Input
 
 ```js
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -48,5 +47,3 @@ import(
 ```
     4: 	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/import_specifiers.js.snap b/crates/biome_js_formatter/tests/specs/js/module/import/import_specifiers.js.snap
index 9005282650b5..499f4e959b99 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/import_specifiers.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/import_specifiers.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/import/import_specifiers.js
 ---
-
 # Input
 
 ```js
@@ -56,7 +55,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -115,5 +114,3 @@ import a, {
    31: import { loooooooooooooooooooooooooooooooooooooooooooooooooong } from "loooooooooooooooooooooooooooooooooooooooooooooong";
    38: import { a as b } from "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/named_import_clause.js.snap b/crates/biome_js_formatter/tests/specs/js/module/import/named_import_clause.js.snap
index 042765c7f613..0b46904e4049 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/named_import_clause.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/named_import_clause.js.snap
@@ -29,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/namespace_import.js.snap b/crates/biome_js_formatter/tests/specs/js/module/import/namespace_import.js.snap
index 182c94e4c982..480dc431acef 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/namespace_import.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/namespace_import.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/import/namespace_import.js
 ---
-
 # Input
 
 ```js
@@ -24,7 +23,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -35,5 +34,3 @@ Attribute Position: Auto
 ```js
 import * as all from "all";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/none/options.json b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/none/options.json
deleted file mode 100644
index 12309404a928..000000000000
--- a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/none/options.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
-  "javascript": {
-    "formatter": {
-      "trailingComma": "none"
-    }
-  }
-}
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/es5/import_trailing_comma.js b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/es5/import_trailing_commas.js
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/es5/import_trailing_comma.js
rename to crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/es5/import_trailing_commas.js
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/es5/import_trailing_comma.js.snap b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/es5/import_trailing_commas.js.snap
similarity index 97%
rename from crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/es5/import_trailing_comma.js.snap
rename to crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/es5/import_trailing_commas.js.snap
index 89d0a79fae02..38faf9330082 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/es5/import_trailing_comma.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/es5/import_trailing_commas.js.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: js/module/import/trailing-comma/es5/import_trailing_comma.js
+info: js/module/import/trailing-commas/es5/import_trailing_commas.js
 ---
 # Input
 
@@ -53,7 +53,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -114,7 +114,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: ES5
+Trailing commas: ES5
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/es5/options.json b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/es5/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/es5/options.json
rename to crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/es5/options.json
index 2de65a30729c..ffd19a430478 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/es5/options.json
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/es5/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "es5"
+      "trailingCommas": "es5"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/none/import_trailing_comma.js b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/none/import_trailing_commas.js
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/none/import_trailing_comma.js
rename to crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/none/import_trailing_commas.js
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/none/import_trailing_comma.js.snap b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/none/import_trailing_commas.js.snap
similarity index 97%
rename from crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/none/import_trailing_comma.js.snap
rename to crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/none/import_trailing_commas.js.snap
index 3317c0c7dd23..74819968fc20 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-comma/none/import_trailing_comma.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/none/import_trailing_commas.js.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: js/module/import/trailing-comma/none/import_trailing_comma.js
+info: js/module/import/trailing-commas/none/import_trailing_commas.js
 ---
 # Input
 
@@ -53,7 +53,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -114,7 +114,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: None
+Trailing commas: None
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/none/options.json b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/none/options.json
new file mode 100644
index 000000000000..6f38a3fd5972
--- /dev/null
+++ b/crates/biome_js_formatter/tests/specs/js/module/import/trailing-commas/none/options.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
+  "javascript": {
+    "formatter": {
+      "trailingCommas": "none"
+    }
+  }
+}
diff --git a/crates/biome_js_formatter/tests/specs/js/module/indent-width/4/example-1.js.snap b/crates/biome_js_formatter/tests/specs/js/module/indent-width/4/example-1.js.snap
index 446ac04a0fb3..a5e45f49f877 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/indent-width/4/example-1.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/indent-width/4/example-1.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -50,7 +50,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/indent-width/4/example-2.js.snap b/crates/biome_js_formatter/tests/specs/js/module/indent-width/4/example-2.js.snap
index fa5fc3ed6feb..a08d3016ea82 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/indent-width/4/example-2.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/indent-width/4/example-2.js.snap
@@ -40,7 +40,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -78,7 +78,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/indent-width/8/example-1.js.snap b/crates/biome_js_formatter/tests/specs/js/module/indent-width/8/example-1.js.snap
index bfdfe6bf633a..e16dc2552bfc 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/indent-width/8/example-1.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/indent-width/8/example-1.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -50,7 +50,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/indent-width/8/example-2.js.snap b/crates/biome_js_formatter/tests/specs/js/module/indent-width/8/example-2.js.snap
index ff2f50fafd14..bddefdaa88b9 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/indent-width/8/example-2.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/indent-width/8/example-2.js.snap
@@ -40,7 +40,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -78,7 +78,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/interpreter-with-trailing-spaces.js.snap b/crates/biome_js_formatter/tests/specs/js/module/interpreter-with-trailing-spaces.js.snap
index b906bb71b453..7e36629a18c5 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/interpreter-with-trailing-spaces.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/interpreter-with-trailing-spaces.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/interpreter-with-trailing-spaces.js
 ---
-
 # Input
 
 ```js
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -38,5 +37,3 @@ Attribute Position: Auto
 #!/usr/bin/env node
 console.log(1);
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/interpreter.js.snap b/crates/biome_js_formatter/tests/specs/js/module/interpreter.js.snap
index 4ac363b68fb9..18e55d4ec4cd 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/interpreter.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/interpreter.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/interpreter.js
 ---
-
 # Input
 
 ```js
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -41,5 +40,3 @@ console.log(1);
 
 console.log(1);
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/interpreter_with_empty_line.js.snap b/crates/biome_js_formatter/tests/specs/js/module/interpreter_with_empty_line.js.snap
index ec56519992d3..c86c13ac6890 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/interpreter_with_empty_line.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/interpreter_with_empty_line.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/interpreter_with_empty_line.js
 ---
-
 # Input
 
 ```js
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -40,5 +39,3 @@ Attribute Position: Auto
 
 console.log(1);
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/invalid/block_stmt_err.js.snap b/crates/biome_js_formatter/tests/specs/js/module/invalid/block_stmt_err.js.snap
index b89b1d3ad17d..8da79d942253 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/invalid/block_stmt_err.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/invalid/block_stmt_err.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/invalid/block_stmt_err.js
 ---
-
 # Input
 
 ```js
@@ -34,7 +33,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -54,5 +53,3 @@ Attribute Position: Auto
 
 let recovered = "no";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/invalid/if_stmt_err.js.snap b/crates/biome_js_formatter/tests/specs/js/module/invalid/if_stmt_err.js.snap
index 66062de7ff51..5d014c461759 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/invalid/if_stmt_err.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/invalid/if_stmt_err.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/invalid/if_stmt_err.js
 ---
-
 # Input
 
 ```js
@@ -40,7 +39,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -62,5 +61,3 @@ if (false) {
 	let x = 99;
 } else {
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/line-ending/cr/line_ending.js.snap b/crates/biome_js_formatter/tests/specs/js/module/line-ending/cr/line_ending.js.snap
index fc8063b90e7d..3419ba84f327 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/line-ending/cr/line_ending.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/line-ending/cr/line_ending.js.snap
@@ -40,7 +40,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -78,7 +78,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/line-ending/crlf/line_ending.js.snap b/crates/biome_js_formatter/tests/specs/js/module/line-ending/crlf/line_ending.js.snap
index 76d0375b78b6..4d593a06ee62 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/line-ending/crlf/line_ending.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/line-ending/crlf/line_ending.js.snap
@@ -40,7 +40,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -78,7 +78,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/newlines.js.snap b/crates/biome_js_formatter/tests/specs/js/module/newlines.js.snap
index 33f8e2b4b47e..2fbec40f4d40 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/newlines.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/newlines.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/newlines.js
 ---
-
 # Input
 
 ```js
@@ -102,7 +101,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -171,5 +170,3 @@ const object = {
 	key4: 4,
 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/no-semi/class.js.snap b/crates/biome_js_formatter/tests/specs/js/module/no-semi/class.js.snap
index 456757b2746e..ae56dbb66c11 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/no-semi/class.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/no-semi/class.js.snap
@@ -141,7 +141,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -278,7 +278,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/no-semi/issue2006.js.snap b/crates/biome_js_formatter/tests/specs/js/module/no-semi/issue2006.js.snap
index 046fa02857e0..80969d337d3f 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/no-semi/issue2006.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/no-semi/issue2006.js.snap
@@ -31,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -60,7 +60,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/no-semi/no-semi.js.snap b/crates/biome_js_formatter/tests/specs/js/module/no-semi/no-semi.js.snap
index e30e7ad09ab7..94bdfdeee0c8 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/no-semi/no-semi.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/no-semi/no-semi.js.snap
@@ -103,7 +103,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -215,7 +215,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/no-semi/private-field.js.snap b/crates/biome_js_formatter/tests/specs/js/module/no-semi/private-field.js.snap
index c4cae4f296ca..e8fcd14043dc 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/no-semi/private-field.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/no-semi/private-field.js.snap
@@ -27,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -52,7 +52,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/no-semi/semicolons-asi.js.snap b/crates/biome_js_formatter/tests/specs/js/module/no-semi/semicolons-asi.js.snap
index 009cf91fa154..9e31dc9a14ac 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/no-semi/semicolons-asi.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/no-semi/semicolons-asi.js.snap
@@ -24,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -46,7 +46,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/no-semi/semicolons_range.js.snap b/crates/biome_js_formatter/tests/specs/js/module/no-semi/semicolons_range.js.snap
index 45c22d603655..8ec09d1cfd91 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/no-semi/semicolons_range.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/no-semi/semicolons_range.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -50,7 +50,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/number/number.js.snap b/crates/biome_js_formatter/tests/specs/js/module/number/number.js.snap
index 9239d48582b7..3885c55eebb5 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/number/number.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/number/number.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/number/number.js
 ---
-
 # Input
 
 ```js
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -38,5 +37,3 @@ Attribute Position: Auto
 1.23e4;
 1000e3; // FIXME handle number with scientific notation #1294
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/number/number_with_space.js.snap b/crates/biome_js_formatter/tests/specs/js/module/number/number_with_space.js.snap
index d3e9d0a15d47..a6dfc33a8c44 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/number/number_with_space.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/number/number_with_space.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/number/number_with_space.js
 ---
-
 # Input
 
 ```js
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -44,5 +43,3 @@ Attribute Position: Auto
 (123) /**/.toString;
 (123).toString;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/bracket-spacing/object_bracket_spacing.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/bracket-spacing/object_bracket_spacing.js.snap
index 31f470e40469..fdf8879ddae2 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/bracket-spacing/object_bracket_spacing.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/bracket-spacing/object_bracket_spacing.js.snap
@@ -45,7 +45,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -84,7 +84,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/computed_member.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/computed_member.js.snap
index 819f723275bf..40c406f638e6 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/computed_member.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/computed_member.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/object/computed_member.js
 ---
-
 # Input
 
 ```js
@@ -43,7 +42,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -79,5 +78,3 @@ x[b["test"]];
 
 a["test"];
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/getter_setter.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/getter_setter.js.snap
index c428c7442360..1f0bf45b87d1 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/getter_setter.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/getter_setter.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/object/getter_setter.js
 ---
-
 # Input
 
 ```js
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -46,5 +45,3 @@ let b = {
 	set foo(a) {},
 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/numeric-property.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/numeric-property.js.snap
index f9784f0f8670..d4f34d5b5f06 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/numeric-property.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/numeric-property.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/object/numeric-property.js
 ---
-
 # Input
 
 ```js
@@ -61,7 +60,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -109,5 +108,3 @@ const x = {
 	"0xan": null,
 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/object.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/object.js.snap
index c739dbd23a47..64e67fc2142d 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/object.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/object.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/object/object.js
 ---
-
 # Input
 
 ```js
@@ -56,7 +55,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -95,5 +94,3 @@ const y = {
 
 ({ a, b, c } = { a: "apple", b: "banana", c: "coconut" });
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/object_comments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/object_comments.js.snap
index de78c3ea740f..c7330ca6a8c6 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/object_comments.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/object_comments.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/object/object_comments.js
 ---
-
 # Input
 
 ```js
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -42,5 +41,3 @@ let a = {
 	// trailing comment
 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/octal_literals_key.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/octal_literals_key.js.snap
index 96a581e0e935..1fb7fb6f75a6 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/octal_literals_key.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/octal_literals_key.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/object/octal_literals_key.js
 ---
-
 # Input
 
 ```js
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -46,5 +45,3 @@ const x = {
 	"010": "oh no",
 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/property_key.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/property_key.js.snap
index c19ecdbe4624..4ecd9a6b9bbe 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/property_key.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/property_key.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/object/property_key.js
 ---
-
 # Input
 
 ```js
@@ -32,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -50,5 +49,3 @@ const foo = {
 	},
 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/property_object_member.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/property_object_member.js.snap
index 6f06a671c103..a8f1e9c4e833 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/property_object_member.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/property_object_member.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/object/property_object_member.js
 ---
-
 # Input
 
 ```js
@@ -112,7 +111,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -297,5 +296,3 @@ const fluidObject = {
    75: 			.longLongLongLongLongLlongLongLongLongLongLongLongLongLongTooLongPropongLongLongLongTooLongProp ===
    78: 		longLongLongLongLongLongLongLongLonlongLongLongLongLongLongLongLongLongTooLongPropgLongLongLongLongTooLongVar ||
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/none/options.json b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/none/options.json
deleted file mode 100644
index 12309404a928..000000000000
--- a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/none/options.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
-  "javascript": {
-    "formatter": {
-      "trailingComma": "none"
-    }
-  }
-}
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/es5/object_trailing_comma.js b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/es5/object_trailing_commas.js
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/es5/object_trailing_comma.js
rename to crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/es5/object_trailing_commas.js
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/es5/object_trailing_comma.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/es5/object_trailing_commas.js.snap
similarity index 92%
rename from crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/es5/object_trailing_comma.js.snap
rename to crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/es5/object_trailing_commas.js.snap
index e970e927e162..45679e611529 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/es5/object_trailing_comma.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/es5/object_trailing_commas.js.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: js/module/object/trailing-comma/es5/object_trailing_comma.js
+info: js/module/object/trailing-commas/es5/object_trailing_commas.js
 ---
 # Input
 
@@ -32,7 +32,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -64,7 +64,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: ES5
+Trailing commas: ES5
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/es5/options.json b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/es5/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/es5/options.json
rename to crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/es5/options.json
index 2de65a30729c..ffd19a430478 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/es5/options.json
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/es5/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "es5"
+      "trailingCommas": "es5"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/none/object_trailing_comma.js b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/none/object_trailing_commas.js
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/none/object_trailing_comma.js
rename to crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/none/object_trailing_commas.js
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/none/object_trailing_comma.js.snap b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/none/object_trailing_commas.js.snap
similarity index 92%
rename from crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/none/object_trailing_comma.js.snap
rename to crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/none/object_trailing_commas.js.snap
index c51539e82341..76162e70d76f 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-comma/none/object_trailing_comma.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/none/object_trailing_commas.js.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: js/module/object/trailing-comma/none/object_trailing_comma.js
+info: js/module/object/trailing-commas/none/object_trailing_commas.js
 ---
 # Input
 
@@ -32,7 +32,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -64,7 +64,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: None
+Trailing commas: None
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/none/options.json b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/none/options.json
new file mode 100644
index 000000000000..6f38a3fd5972
--- /dev/null
+++ b/crates/biome_js_formatter/tests/specs/js/module/object/trailing-commas/none/options.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "../../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
+  "javascript": {
+    "formatter": {
+      "trailingCommas": "none"
+    }
+  }
+}
diff --git a/crates/biome_js_formatter/tests/specs/js/module/parentheses/parentheses.js.snap b/crates/biome_js_formatter/tests/specs/js/module/parentheses/parentheses.js.snap
index a8ee0a54e2f9..58a42dc834d5 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/parentheses/parentheses.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/parentheses/parentheses.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/parentheses/parentheses.js
 ---
-
 # Input
 
 ```js
@@ -47,7 +46,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -86,5 +85,3 @@ const a = () => ({})?.() && a;
 ```
    11: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/parentheses/range_parentheses_binary.js.snap b/crates/biome_js_formatter/tests/specs/js/module/parentheses/range_parentheses_binary.js.snap
index 6093d8ffc863..a779f867da33 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/parentheses/range_parentheses_binary.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/parentheses/range_parentheses_binary.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/parentheses/range_parentheses_binary.js
 ---
-
 # Input
 
 ```js
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -41,5 +40,3 @@ import React from 'react'; function test() { const AppShelled = () => 1 + 2 } fu
 ```
     1: import React from 'react'; function test() { const AppShelled = () => 1 + 2 } function one() {return 1}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/range/range_parenthesis_after_semicol.js.snap b/crates/biome_js_formatter/tests/specs/js/module/range/range_parenthesis_after_semicol.js.snap
index e1821a5e1786..35ddace663f4 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/range/range_parenthesis_after_semicol.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/range/range_parenthesis_after_semicol.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/range/range_parenthesis_after_semicol.js
 ---
-
 # Input
 
 ```js
@@ -34,7 +33,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -55,5 +54,3 @@ console.log("🚀".length);
 
 ("Jan 1, 2018 – Jan 1, 2019");
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/range/range_parenthesis_after_semicol_1.js.snap b/crates/biome_js_formatter/tests/specs/js/module/range/range_parenthesis_after_semicol_1.js.snap
index 491d49746bf1..f22cc3027cb9 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/range/range_parenthesis_after_semicol_1.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/range/range_parenthesis_after_semicol_1.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/range/range_parenthesis_after_semicol_1.js
 ---
-
 # Input
 
 ```js
@@ -32,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -52,5 +51,3 @@ const a = () => {
 console.log("🚀".length);
 ("Jan 1, 2018 – Jan 1, 2019");
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/script.js.snap b/crates/biome_js_formatter/tests/specs/js/module/script.js.snap
index e6545d762d97..e6bf3a8d8bb5 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/script.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/script.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/script.js
 ---
-
 # Input
 
 ```js
@@ -28,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -42,5 +41,3 @@ Attribute Position: Auto
 "use asm";
 var express = require("express");
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/block_statement.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/block_statement.js.snap
index 053b1d5ccddf..bbdbbdca5d90 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/block_statement.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/block_statement.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/block_statement.js
 ---
-
 # Input
 
 ```js
@@ -33,7 +32,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -50,5 +49,3 @@ if (true) {
 	;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/continue_stmt.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/continue_stmt.js.snap
index eaffc56e3559..d748eed97ecf 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/continue_stmt.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/continue_stmt.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/do_while.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/do_while.js.snap
index 56cdecba2f45..7e1e725f3308 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/do_while.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/do_while.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/do_while.js
 ---
-
 # Input
 
 ```js
@@ -38,7 +37,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -59,5 +58,3 @@ do {
 do;
 while (true);
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/empty_blocks.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/empty_blocks.js.snap
index 0b18fe12cfca..cf3aa720a7cb 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/empty_blocks.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/empty_blocks.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/empty_blocks.js
 ---
-
 # Input
 
 ```js
@@ -53,7 +52,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -99,5 +98,3 @@ for (;;) {}
 while (true) {}
 do {} while (true);
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/for_in.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/for_in.js.snap
index 21f523d286cb..ef46288c8275 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/for_in.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/for_in.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/for_in.js
 ---
-
 # Input
 
 ```js
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -54,5 +53,3 @@ for (a in b) {
 ```
     4: for (aVeryLongVariableNameToEnforceLineBreaksaVeryLongVariableNameToEnforceLineBreaks in aVeryLongVariableNameToEnforceLineBreaksaVeryLongVariableNameToEnforceLineBreaks) {
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/for_loop.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/for_loop.js.snap
index 25b5691cc6a6..bc6155b972e4 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/for_loop.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/for_loop.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/for_loop.js
 ---
-
 # Input
 
 ```js
@@ -41,7 +40,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -71,5 +70,3 @@ for (
 	aVeryLongVariableNameToEnforceLineBreaks
 ) {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/for_of.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/for_of.js.snap
index b34e160a3b69..24f37fd3969c 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/for_of.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/for_of.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/for_of.js
 ---
-
 # Input
 
 ```js
@@ -32,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -58,5 +57,3 @@ for await (const a of b) {
 ```
     7: for (const aVeryLongVariableNameToEnforceLineBreaksaVeryLongVariableNameToEnforceLineBreaks of aVeryLongVariableNameToEnforceLineBreaksaVeryLongVariableNameToEnforceLineBreaks) {
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/if_chain.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/if_chain.js.snap
index bf37b58fcb48..886e5ade98f1 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/if_chain.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/if_chain.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/if_chain.js
 ---
-
 # Input
 
 ```js
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -44,5 +43,3 @@ if (very_long_condition_1) very_long_statement_1();
 else if (very_long_condition_2) very_long_statement_2();
 else very_long_statement_3();
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/if_else.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/if_else.js.snap
index d0d0e3d3ef2d..686fdf61d65d 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/if_else.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/if_else.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/if_else.js
 ---
-
 # Input
 
 ```js
@@ -93,7 +92,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -166,5 +165,3 @@ if (true) {
 ) {
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/return.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/return.js.snap
index 7162b703cefa..98db0260d4de 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/return.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/return.js.snap
@@ -48,7 +48,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/return_verbatim_argument.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/return_verbatim_argument.js.snap
index 8bb38aa0b3ac..4e03d62df862 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/return_verbatim_argument.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/return_verbatim_argument.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/return_verbatim_argument.js
 ---
-
 # Input
 
 ```js
@@ -49,7 +48,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -90,5 +89,3 @@ function supported3() {
     6: 		// rome-ignore lint/style/useOptionalChain: Optional chaining creates more complicated ES2019 code
    14: 		// rome-ignore lint/style/useOptionalChain: Optional chaining creates more complicated ES2019 code
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/statement.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/statement.js.snap
index 1aecffb21a06..9ffb699945c4 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/statement.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/statement.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/statement.js
 ---
-
 # Input
 
 ```js
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -37,5 +36,3 @@ Attribute Position: Auto
 ```js
 debugger;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/switch.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/switch.js.snap
index e2ccab4224f2..ee9cb02a7c61 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/switch.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/switch.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/switch.js
 ---
-
 # Input
 
 ```js
@@ -75,7 +74,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -137,5 +136,3 @@ switch (key) {
 		break;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/switch_comment.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/switch_comment.js.snap
index 8fb64acd2d8f..2f3538dc289a 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/switch_comment.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/switch_comment.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/switch_comment.js
 ---
-
 # Input
 
 ```js
@@ -42,7 +41,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -72,5 +71,3 @@ switch (x) {
 		break;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/throw.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/throw.js.snap
index 8cf4c946e7ad..655679bd386e 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/throw.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/throw.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/throw.js
 ---
-
 # Input
 
 ```js
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -40,5 +39,3 @@ throw "Something";
 
 throw false;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/try_catch_finally.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/try_catch_finally.js.snap
index 16a437fa365e..e1ce02e8988b 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/try_catch_finally.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/try_catch_finally.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/try_catch_finally.js
 ---
-
 # Input
 
 ```js
@@ -50,7 +49,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -85,5 +84,3 @@ try {
 	var foo = 4;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/statement/while_loop.js.snap b/crates/biome_js_formatter/tests/specs/js/module/statement/while_loop.js.snap
index 3ed3543ecca2..5744e60cd8c5 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/statement/while_loop.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/statement/while_loop.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/statement/while_loop.js
 ---
-
 # Input
 
 ```js
@@ -50,7 +49,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -84,5 +83,3 @@ tour: while (true) {
 	break tour;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/directives.js.snap b/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/directives.js.snap
index 4a0f2c9b73f6..d9599447777c 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/directives.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/directives.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -51,7 +51,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: Preserve
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/parentheses_token.js.snap b/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/parentheses_token.js.snap
index 432b3558bbf5..d6a63809be2b 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/parentheses_token.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/parentheses_token.js.snap
@@ -24,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -46,7 +46,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: Preserve
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/properties_quotes.js.snap b/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/properties_quotes.js.snap
index 06adf99c3cae..718588f8e67e 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/properties_quotes.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/properties_quotes.js.snap
@@ -66,7 +66,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -131,7 +131,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: Preserve
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/string.js.snap b/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/string.js.snap
index 00905d443b8e..b8d97a130071 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/string.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/string/quotePreserve/string.js.snap
@@ -80,7 +80,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -169,7 +169,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: Preserve
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/directives.js.snap b/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/directives.js.snap
index 69cc73ea2ee4..9bedf4c8528e 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/directives.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/directives.js.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -51,7 +51,7 @@ Line width: 80
 Quote style: Single Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/parentheses_token.js.snap b/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/parentheses_token.js.snap
index c3ed26145589..033430c47d17 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/parentheses_token.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/parentheses_token.js.snap
@@ -24,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -46,7 +46,7 @@ Line width: 80
 Quote style: Single Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/properties_quotes.js.snap b/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/properties_quotes.js.snap
index bf01795d5634..31f88e9bf920 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/properties_quotes.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/properties_quotes.js.snap
@@ -66,7 +66,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -131,7 +131,7 @@ Line width: 80
 Quote style: Single Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/string.js.snap b/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/string.js.snap
index c63194487eb7..b2edd7b90f62 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/string.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/string/quoteSingle/string.js.snap
@@ -80,7 +80,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -169,7 +169,7 @@ Line width: 80
 Quote style: Single Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/suppression.js.snap b/crates/biome_js_formatter/tests/specs/js/module/suppression.js.snap
index 5081fae26b8d..16c0c4ae47e1 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/suppression.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/suppression.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/suppression.js
 ---
-
 # Input
 
 ```js
@@ -52,7 +51,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -91,5 +90,3 @@ let a =
 	// rome-ignore format: test
 	function () {};
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/module/template/template.js.snap b/crates/biome_js_formatter/tests/specs/js/module/template/template.js.snap
index 0b1d70aeb42b..86691ab7378d 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/template/template.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/template/template.js.snap
@@ -83,7 +83,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/js/module/with.js.snap b/crates/biome_js_formatter/tests/specs/js/module/with.js.snap
index 9aefd592fee5..8c2107e67bdd 100644
--- a/crates/biome_js_formatter/tests/specs/js/module/with.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/module/with.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/module/with.js
 ---
-
 # Input
 
 ```js
@@ -29,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -44,5 +43,3 @@ with (   b)
 	5
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/script/script.js.snap b/crates/biome_js_formatter/tests/specs/js/script/script.js.snap
index f27663ba4c7d..1f1a7185a0cf 100644
--- a/crates/biome_js_formatter/tests/specs/js/script/script.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/script/script.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/script/script.js
 ---
-
 # Input
 
 ```js
@@ -28,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -42,5 +41,3 @@ Attribute Position: Auto
 "use asm";
 var express = require("express");
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/script/script_with_bom.js.snap b/crates/biome_js_formatter/tests/specs/js/script/script_with_bom.js.snap
index 0ee11e39fbca..44388d27703b 100644
--- a/crates/biome_js_formatter/tests/specs/js/script/script_with_bom.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/script/script_with_bom.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/script/script_with_bom.js
 ---
-
 # Input
 
 ```js
@@ -28,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -42,5 +41,3 @@ Attribute Position: Auto
 "use asm";
 var express = require("express");
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/js/script/with.js.snap b/crates/biome_js_formatter/tests/specs/js/script/with.js.snap
index 10550e72617c..c48fcd07622d 100644
--- a/crates/biome_js_formatter/tests/specs/js/script/with.js.snap
+++ b/crates/biome_js_formatter/tests/specs/js/script/with.js.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: js/script/with.js
 ---
-
 # Input
 
 ```js
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -46,5 +45,3 @@ with (b) {
 with ({}) {
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/arrow_function.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/arrow_function.jsx.snap
index f1752625ed21..fa0a374cf9b2 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/arrow_function.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/arrow_function.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/arrow_function.jsx
 ---
-
 # Input
 
 ```jsx
@@ -64,7 +63,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -114,5 +113,3 @@ function ArrowCurryWithDestructuringParameters() {
 		(props) => <C {...props} />;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/attribute_escape.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/attribute_escape.jsx.snap
index b842f876a5b2..dca2b7523a7a 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/attribute_escape.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/attribute_escape.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/attribute_escape.jsx
 ---
-
 # Input
 
 ```jsx
@@ -39,7 +38,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -64,5 +63,3 @@ const a = () => {
 	);
 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/attribute_position/attribute_position.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/attribute_position/attribute_position.jsx.snap
index 36278120d16e..c19b44e279e9 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/attribute_position/attribute_position.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/attribute_position/attribute_position.jsx.snap
@@ -50,7 +50,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -109,7 +109,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/jsx/attributes.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/attributes.jsx.snap
index e416a373b8cb..d726901c1d17 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/attributes.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/attributes.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/attributes.jsx
 ---
-
 # Input
 
 ```jsx
@@ -100,7 +99,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -211,5 +210,3 @@ const a = (
    30: 			"ui-monospace,SFMono-Regular,SF Mono,Consolas,Liberation Mono,Menlo,monospace",
    85: 			veryLongConditionZzzzzzzzzzzzzzzzzveryLongConditionZzzzzzzzzzzzzzzzzveryLongConditionZzzzzzzzzzzzzzzzz,
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/bracket_same_line/bracket_same_line.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/bracket_same_line/bracket_same_line.jsx.snap
index 54aa3d888f47..09a47bcaad07 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/bracket_same_line/bracket_same_line.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/bracket_same_line/bracket_same_line.jsx.snap
@@ -40,7 +40,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -79,7 +79,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/jsx/comments.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/comments.jsx.snap
index f353e525c31e..0648e5036ad6 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/comments.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/comments.jsx.snap
@@ -31,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/jsx/conditional.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/conditional.jsx.snap
index 2630fd093f3f..df2ceea9ab30 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/conditional.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/conditional.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/conditional.jsx
 ---
-
 # Input
 
 ```jsx
@@ -73,7 +72,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -136,5 +135,3 @@ Attribute Position: Auto
 	)
 ) : null;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/element.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/element.jsx.snap
index fb4f6d43ab18..0729f8461112 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/element.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/element.jsx.snap
@@ -353,7 +353,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/jsx/fragment.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/fragment.jsx.snap
index 26a3d0999641..08b7a9933c68 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/fragment.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/fragment.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/fragment.jsx
 ---
-
 # Input
 
 ```jsx
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -39,5 +38,3 @@ Attribute Position: Auto
 <>
 </>
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/new-lines.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/new-lines.jsx.snap
index 12dbe7b3b909..1f98f90b71ff 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/new-lines.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/new-lines.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/new-lines.jsx
 ---
-
 # Input
 
 ```jsx
@@ -74,7 +73,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -129,5 +128,3 @@ let myDiv3 = ReactTestUtils.renderIntoDocument(
 	</div1>,
 );
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/parentheses_range.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/parentheses_range.jsx.snap
index c992fc2d95dd..db6c91045a25 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/parentheses_range.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/parentheses_range.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/parentheses_range.jsx
 ---
-
 # Input
 
 ```jsx
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -41,5 +40,3 @@ import React from 'react'; function test() { const AppShelled = () => <Component
 ```
     1: import React from 'react'; function test() { const AppShelled = () => <Component /> } function lol() {return 1}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_double_string_double/quote_style.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_double_string_double/quote_style.jsx.snap
index 145271ec2941..b42e52a22f73 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_double_string_double/quote_style.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_double_string_double/quote_style.jsx.snap
@@ -31,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -55,7 +55,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_double_string_single/quote_style.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_double_string_single/quote_style.jsx.snap
index 12a5e21f5b9f..8c494d252255 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_double_string_single/quote_style.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_double_string_single/quote_style.jsx.snap
@@ -31,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -55,7 +55,7 @@ Line width: 80
 Quote style: Single Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_single_string_double/quote_style.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_single_string_double/quote_style.jsx.snap
index 0390e13c0ea3..91c6f6f28523 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_single_string_double/quote_style.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_single_string_double/quote_style.jsx.snap
@@ -31,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -55,7 +55,7 @@ Line width: 80
 Quote style: Single Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_single_string_single/quote_style.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_single_string_single/quote_style.jsx.snap
index 7c2920f14394..9e67b5692086 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_single_string_single/quote_style.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/quote_style/jsx_single_string_single/quote_style.jsx.snap
@@ -31,7 +31,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -55,7 +55,7 @@ Line width: 80
 Quote style: Single Quotes
 JSX quote style: Single Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/jsx/self_closing.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/self_closing.jsx.snap
index 6d25a67d8033..aa02732e79f7 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/self_closing.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/self_closing.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/self_closing.jsx
 ---
-
 # Input
 
 ```jsx
@@ -45,7 +44,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -70,5 +69,3 @@ Attribute Position: Auto
 	<Foo />
 </>;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/smoke.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/smoke.jsx.snap
index 3b4e19ba4052..2ae44f5f6aa9 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/smoke.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/smoke.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/smoke.jsx
 ---
-
 # Input
 
 ```jsx
@@ -24,7 +23,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -35,5 +34,3 @@ Attribute Position: Auto
 ```jsx
 "foo";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/jsx/text_children.jsx.snap b/crates/biome_js_formatter/tests/specs/jsx/text_children.jsx.snap
index 1d65cc79a5a5..0b71b9e0f65d 100644
--- a/crates/biome_js_formatter/tests/specs/jsx/text_children.jsx.snap
+++ b/crates/biome_js_formatter/tests/specs/jsx/text_children.jsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: jsx/text_children.jsx
 ---
-
 # Input
 
 ```jsx
@@ -125,7 +124,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -241,5 +240,3 @@ Attribute Position: Auto
 	<div>third</div>
 </>;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/arrow/arrow_parentheses.ts.snap b/crates/biome_js_formatter/tests/specs/ts/arrow/arrow_parentheses.ts.snap
index e4ba4f350967..cb320edd0818 100644
--- a/crates/biome_js_formatter/tests/specs/ts/arrow/arrow_parentheses.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/arrow/arrow_parentheses.ts.snap
@@ -36,7 +36,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -70,7 +70,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/arrow/long_arrow_parentheses_with_line_break.ts.snap b/crates/biome_js_formatter/tests/specs/ts/arrow/long_arrow_parentheses_with_line_break.ts.snap
index 0d46c8318bfb..58f51107720d 100644
--- a/crates/biome_js_formatter/tests/specs/ts/arrow/long_arrow_parentheses_with_line_break.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/arrow/long_arrow_parentheses_with_line_break.ts.snap
@@ -38,7 +38,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -74,7 +74,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/arrow/parameter_default_binding_line_break.ts.snap b/crates/biome_js_formatter/tests/specs/ts/arrow/parameter_default_binding_line_break.ts.snap
index 2b434fa65590..c12af5abc23c 100644
--- a/crates/biome_js_formatter/tests/specs/ts/arrow/parameter_default_binding_line_break.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/arrow/parameter_default_binding_line_break.ts.snap
@@ -43,7 +43,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -78,7 +78,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: As needed
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/arrow_chain.ts.snap b/crates/biome_js_formatter/tests/specs/ts/arrow_chain.ts.snap
index 98ed7530a9f6..05be128aaffb 100644
--- a/crates/biome_js_formatter/tests/specs/ts/arrow_chain.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/arrow_chain.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/arrow_chain.ts
 ---
-
 # Input
 
 ```ts
@@ -35,7 +34,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -72,5 +71,3 @@ const x = (a) => (b) => (
 	aLongSequenceExpression, thatContinuesFurtherOnUntilItBreaks, expands
 );
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/assignment/as_assignment.ts.snap b/crates/biome_js_formatter/tests/specs/ts/assignment/as_assignment.ts.snap
index 5bf7fb79e75a..39a04acbe559 100644
--- a/crates/biome_js_formatter/tests/specs/ts/assignment/as_assignment.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/assignment/as_assignment.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/assignment/as_assignment.ts
 ---
-
 # Input
 
 ```ts
@@ -29,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -45,5 +44,3 @@ let binding;
 (binding.very.long.chain.of.static.members as VeryLongTypeName) =
 	veryLongExpression();
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/assignment/assignment.ts.snap b/crates/biome_js_formatter/tests/specs/ts/assignment/assignment.ts.snap
index dab0dc7043bb..97d6e76177ba 100644
--- a/crates/biome_js_formatter/tests/specs/ts/assignment/assignment.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/assignment/assignment.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/assignment/assignment.ts
 ---
-
 # Input
 
 ```ts
@@ -37,7 +36,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -61,5 +60,3 @@ loooooooooooooooooooooooooong7 =
 const gitBaseExtension =
 	extensions.getExtension<GitBaseExtension>("vscode.git-base")!.exports;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/assignment/assignment_comments.ts.snap b/crates/biome_js_formatter/tests/specs/ts/assignment/assignment_comments.ts.snap
index d5d7086b4f0e..a0745f97b789 100644
--- a/crates/biome_js_formatter/tests/specs/ts/assignment/assignment_comments.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/assignment/assignment_comments.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/assignment/assignment_comments.ts
 ---
-
 # Input
 
 ```ts
@@ -45,7 +44,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -71,5 +70,3 @@ const e: string =
 	// 2
 	{ object: 5 };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/assignment/property_assignment_comments.ts.snap b/crates/biome_js_formatter/tests/specs/ts/assignment/property_assignment_comments.ts.snap
index 3900ee9a4fbe..79859e94e3df 100644
--- a/crates/biome_js_formatter/tests/specs/ts/assignment/property_assignment_comments.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/assignment/property_assignment_comments.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/assignment/property_assignment_comments.ts
 ---
-
 # Input
 
 ```ts
@@ -57,7 +56,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -93,5 +92,3 @@ class Test {
 		{ object: 3 };
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/assignment/type_assertion_assignment.ts.snap b/crates/biome_js_formatter/tests/specs/ts/assignment/type_assertion_assignment.ts.snap
index b6e1be354995..50f33ce44272 100644
--- a/crates/biome_js_formatter/tests/specs/ts/assignment/type_assertion_assignment.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/assignment/type_assertion_assignment.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/assignment/type_assertion_assignment.ts
 ---
-
 # Input
 
 ```ts
@@ -38,7 +37,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -58,5 +57,3 @@ for (<boolean>x of []) {
 }
 ({ x: <string>x } = { x: "test" });
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/binding/definite_variable.ts.snap b/crates/biome_js_formatter/tests/specs/ts/binding/definite_variable.ts.snap
index 4cd5aecce7b8..13008f2deeaf 100644
--- a/crates/biome_js_formatter/tests/specs/ts/binding/definite_variable.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/binding/definite_variable.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/binding/definite_variable.ts
 ---
-
 # Input
 
 ```ts
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -36,5 +35,3 @@ Attribute Position: Auto
 ```ts
 let definiteVariable!: TypeName;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/call_expression.ts.snap b/crates/biome_js_formatter/tests/specs/ts/call_expression.ts.snap
index ee36aac72c05..6178e683d26a 100644
--- a/crates/biome_js_formatter/tests/specs/ts/call_expression.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/call_expression.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/call_expression.ts
 ---
-
 # Input
 
 ```ts
@@ -57,7 +56,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -99,5 +98,3 @@ users.map((user: User): User => {
 	// comment
 });
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/accessor.ts.snap b/crates/biome_js_formatter/tests/specs/ts/class/accessor.ts.snap
index 935d012b1e06..8b0dea337175 100644
--- a/crates/biome_js_formatter/tests/specs/ts/class/accessor.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/class/accessor.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/class/accessor.ts
 ---
-
 # Input
 
 ```ts
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -39,5 +38,3 @@ export abstract class C {
 	protected abstract accessor prop: number;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/assigment_layout.ts.snap b/crates/biome_js_formatter/tests/specs/ts/class/assigment_layout.ts.snap
index 7b886168c858..9ca4583e7edd 100644
--- a/crates/biome_js_formatter/tests/specs/ts/class/assigment_layout.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/class/assigment_layout.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/class/assigment_layout.ts
 ---
-
 # Input
 
 ```ts
@@ -31,7 +30,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -48,5 +47,3 @@ class SourceRemoveUnused extends SourceAction {
 		"javascript-walkthrough.commands.nodeInstallationFound";
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/constructor_parameter.ts.snap b/crates/biome_js_formatter/tests/specs/ts/class/constructor_parameter.ts.snap
index 8917624517b5..811318689fdf 100644
--- a/crates/biome_js_formatter/tests/specs/ts/class/constructor_parameter.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/class/constructor_parameter.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/class/constructor_parameter.ts
 ---
-
 # Input
 
 ```ts
@@ -68,7 +67,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -115,5 +114,3 @@ class MyClass {
 	) {}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/implements_clause.ts.snap b/crates/biome_js_formatter/tests/specs/ts/class/implements_clause.ts.snap
index b41d696f9543..17f9135e08a0 100644
--- a/crates/biome_js_formatter/tests/specs/ts/class/implements_clause.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/class/implements_clause.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/class/implements_clause.ts
 ---
-
 # Input
 
 ```ts
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -40,5 +39,3 @@ class ClassName implements Interface {}
 class LongClassName
 	implements Interface1, Interface2, Interface3, Interface4, Interface5 {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/readonly_ambient_property.ts.snap b/crates/biome_js_formatter/tests/specs/ts/class/readonly_ambient_property.ts.snap
index c2cd891dc57f..5f9e4068193d 100644
--- a/crates/biome_js_formatter/tests/specs/ts/class/readonly_ambient_property.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/class/readonly_ambient_property.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/class/readonly_ambient_property.ts
 ---
-
 # Input
 
 ```ts
@@ -34,7 +33,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -50,5 +49,3 @@ export class B {
 	declare readonly prop = "value__value__value__value__value__value__value";
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/es5/class_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/es5/class_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/es5/class_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/es5/class_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/es5/class_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/es5/class_trailing_commas.ts.snap
similarity index 95%
rename from crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/es5/class_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/es5/class_trailing_commas.ts.snap
index ceaa1074b8f2..25eddfa95a4f 100644
--- a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/es5/class_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/es5/class_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/class/trailing_comma/es5/class_trailing_comma.ts
+info: ts/class/trailing_commas/es5/class_trailing_commas.ts
 ---
 # Input
 
@@ -34,7 +34,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -80,7 +80,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: ES5
+Trailing commas: ES5
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/es5/options.json b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/es5/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/es5/options.json
rename to crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/es5/options.json
index 3872f183a485..1e34894c5c9f 100644
--- a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/es5/options.json
+++ b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/es5/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "es5"
+      "trailingCommas": "es5"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/none/class_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/none/class_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/none/class_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/none/class_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/none/class_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/none/class_trailing_commas.ts.snap
similarity index 95%
rename from crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/none/class_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/none/class_trailing_commas.ts.snap
index ea72d8cf4b6b..6e90634a3bb5 100644
--- a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/none/class_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/none/class_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/class/trailing_comma/none/class_trailing_comma.ts
+info: ts/class/trailing_commas/none/class_trailing_commas.ts
 ---
 # Input
 
@@ -34,7 +34,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -80,7 +80,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: None
+Trailing commas: None
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/none/options.json b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/none/options.json
similarity index 81%
rename from crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/none/options.json
rename to crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/none/options.json
index ca3ca7e7c84d..39962fb8149c 100644
--- a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/none/options.json
+++ b/crates/biome_js_formatter/tests/specs/ts/class/trailing_commas/none/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "none"
+      "trailingCommas": "none"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/ts/declaration/class.ts.snap b/crates/biome_js_formatter/tests/specs/ts/declaration/class.ts.snap
index 266dff518278..077bb6631b80 100644
--- a/crates/biome_js_formatter/tests/specs/ts/declaration/class.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/declaration/class.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/declaration/class.ts
 ---
-
 # Input
 
 ```ts
@@ -83,7 +82,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -154,5 +153,3 @@ abstract class Test1 {
 	protected abstract readonly h: string;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/declaration/declare_function.ts.snap b/crates/biome_js_formatter/tests/specs/ts/declaration/declare_function.ts.snap
index 2563e32fecf7..aead83c8e546 100644
--- a/crates/biome_js_formatter/tests/specs/ts/declaration/declare_function.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/declaration/declare_function.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/declaration/declare_function.ts
 ---
-
 # Input
 
 ```ts
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -44,5 +43,3 @@ declare function looooooooooooooooooooooooooooong_naaaaaame<
 	ThirdType,
 >(loreum: string, ipsum: number, chilly: symbol, powder: number): string;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/declaration/global_declaration.ts.snap b/crates/biome_js_formatter/tests/specs/ts/declaration/global_declaration.ts.snap
index 90e69d7a351e..bf92f6c108ca 100644
--- a/crates/biome_js_formatter/tests/specs/ts/declaration/global_declaration.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/declaration/global_declaration.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/declaration/global_declaration.ts
 ---
-
 # Input
 
 ```ts
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -45,5 +44,3 @@ declare module "./test" {
 	}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/declaration/interface.ts.snap b/crates/biome_js_formatter/tests/specs/ts/declaration/interface.ts.snap
index fa17c0158e55..f95ab0f9fc0e 100644
--- a/crates/biome_js_formatter/tests/specs/ts/declaration/interface.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/declaration/interface.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/declaration/interface.ts
 ---
-
 # Input
 
 ```ts
@@ -71,7 +70,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -138,5 +137,3 @@ x.y(() => {
 
 interface A<> {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/declaration/variable_declaration.ts.snap b/crates/biome_js_formatter/tests/specs/ts/declaration/variable_declaration.ts.snap
index 85cee4eea8d7..2f08f5443ec7 100644
--- a/crates/biome_js_formatter/tests/specs/ts/declaration/variable_declaration.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/declaration/variable_declaration.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/declaration/variable_declaration.ts
 ---
-
 # Input
 
 ```ts
@@ -111,7 +110,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -258,5 +257,3 @@ let looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
   120: let loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong2 =
   122: let loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong3 =
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/declare.ts.snap b/crates/biome_js_formatter/tests/specs/ts/declare.ts.snap
index da478a98adf5..2c1d95b04cf3 100644
--- a/crates/biome_js_formatter/tests/specs/ts/declare.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/declare.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/declare.ts
 ---
-
 # Input
 
 ```ts
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -44,5 +43,3 @@ declare module "other";
 
 declare module "remark-html" {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/decoartors.ts.snap b/crates/biome_js_formatter/tests/specs/ts/decoartors.ts.snap
index 8b24a2bb5eb2..0dc5f4fb7222 100644
--- a/crates/biome_js_formatter/tests/specs/ts/decoartors.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/decoartors.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/decoartors.ts
 ---
-
 # Input
 
 ```ts
@@ -282,7 +281,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -539,5 +538,3 @@ class Foo {
 	) {}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/decorators/class_members.ts.snap b/crates/biome_js_formatter/tests/specs/ts/decorators/class_members.ts.snap
index 993811b37447..d5fb402ee3c8 100644
--- a/crates/biome_js_formatter/tests/specs/ts/decorators/class_members.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/decorators/class_members.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/decorators/class_members.ts
 ---
-
 # Input
 
 ```ts
@@ -116,7 +115,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -229,5 +228,3 @@ class Foo {
 	public set setter(val) {}
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_es5/enum_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_es5/enum_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_es5/enum_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_es5/enum_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_es5/enum_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_es5/enum_trailing_commas.ts.snap
similarity index 91%
rename from crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_es5/enum_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_es5/enum_trailing_commas.ts.snap
index c980229fd96a..cedb7084b35d 100644
--- a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_es5/enum_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_es5/enum_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/enum/trailing_comma_es5/enum_trailing_comma.ts
+info: ts/enum/trailing_commas_es5/enum_trailing_commas.ts
 ---
 # Input
 
@@ -28,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -54,7 +54,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: ES5
+Trailing commas: ES5
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_es5/options.json b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_es5/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_es5/options.json
rename to crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_es5/options.json
index 376549ccea28..29c27399b2af 100644
--- a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_es5/options.json
+++ b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_es5/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "es5"
+      "trailingCommas": "es5"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_none/enum_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_none/enum_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_none/enum_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_none/enum_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_none/enum_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_none/enum_trailing_commas.ts.snap
similarity index 91%
rename from crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_none/enum_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_none/enum_trailing_commas.ts.snap
index 05668ba7fa4a..d97e801bb5f8 100644
--- a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_none/enum_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_none/enum_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/enum/trailing_comma_none/enum_trailing_comma.ts
+info: ts/enum/trailing_commas_none/enum_trailing_commas.ts
 ---
 # Input
 
@@ -28,7 +28,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -54,7 +54,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: None
+Trailing commas: None
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_none/options.json b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_none/options.json
similarity index 81%
rename from crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_none/options.json
rename to crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_none/options.json
index 9af258d75592..ec98f8aeb828 100644
--- a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_none/options.json
+++ b/crates/biome_js_formatter/tests/specs/ts/enum/trailing_commas_none/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "none"
+      "trailingCommas": "none"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/ts/expression/as_expression.ts.snap b/crates/biome_js_formatter/tests/specs/ts/expression/as_expression.ts.snap
index 91fc451350ed..4a5cb45d7c3e 100644
--- a/crates/biome_js_formatter/tests/specs/ts/expression/as_expression.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/expression/as_expression.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/expression/as_expression.ts
 ---
-
 # Input
 
 ```ts
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -39,5 +38,3 @@ Attribute Position: Auto
 let a: any;
 let b = a as string;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/expression/bracket-spacing/expression_bracket_spacing.ts.snap b/crates/biome_js_formatter/tests/specs/ts/expression/bracket-spacing/expression_bracket_spacing.ts.snap
index beeccd48e86c..adf5c45466df 100644
--- a/crates/biome_js_formatter/tests/specs/ts/expression/bracket-spacing/expression_bracket_spacing.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/expression/bracket-spacing/expression_bracket_spacing.ts.snap
@@ -90,7 +90,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -207,7 +207,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/ts/expression/non_null_expression.ts.snap b/crates/biome_js_formatter/tests/specs/ts/expression/non_null_expression.ts.snap
index 4434bf5d1ef9..c710c497765d 100644
--- a/crates/biome_js_formatter/tests/specs/ts/expression/non_null_expression.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/expression/non_null_expression.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/expression/non_null_expression.ts
 ---
-
 # Input
 
 ```ts
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -37,5 +36,3 @@ Attribute Position: Auto
 let a: any;
 let b = a!;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/expression/type_assertion_expression.ts.snap b/crates/biome_js_formatter/tests/specs/ts/expression/type_assertion_expression.ts.snap
index 9b4755d68438..44c974ce4b1a 100644
--- a/crates/biome_js_formatter/tests/specs/ts/expression/type_assertion_expression.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/expression/type_assertion_expression.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/expression/type_assertion_expression.ts
 ---
-
 # Input
 
 ```ts
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -43,5 +42,3 @@ let x = <const>"hello";
 let y = <string>x;
 var d = <Error>{ name: "foo", message: "bar" };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/expression/type_expression.ts.snap b/crates/biome_js_formatter/tests/specs/ts/expression/type_expression.ts.snap
index e502e61634d4..0ba2448f4b5b 100644
--- a/crates/biome_js_formatter/tests/specs/ts/expression/type_expression.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/expression/type_expression.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/expression/type_expression.ts
 ---
-
 # Input
 
 ```ts
@@ -130,7 +129,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -252,5 +251,3 @@ type Type01 = 0 extends (1 extends 2 ? 3 : 4) ? 5 : 6;
 
 type A<> = {};
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/expression/type_member.ts.snap b/crates/biome_js_formatter/tests/specs/ts/expression/type_member.ts.snap
index 5c8dcf1325d7..fee9d4b5e7d2 100644
--- a/crates/biome_js_formatter/tests/specs/ts/expression/type_member.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/expression/type_member.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/expression/type_member.ts
 ---
-
 # Input
 
 ```ts
@@ -70,7 +69,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -178,5 +177,3 @@ type J = {
 
 type K = { set something(something_with_long_name: string) };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/function/parameters/line_width_100/function_parameters.ts.snap b/crates/biome_js_formatter/tests/specs/ts/function/parameters/line_width_100/function_parameters.ts.snap
index 1f20d47693a1..68107e4c4fdc 100644
--- a/crates/biome_js_formatter/tests/specs/ts/function/parameters/line_width_100/function_parameters.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/function/parameters/line_width_100/function_parameters.ts.snap
@@ -56,7 +56,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -112,7 +112,7 @@ Line width: 100
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/function/parameters/line_width_120/function_parameters.ts.snap b/crates/biome_js_formatter/tests/specs/ts/function/parameters/line_width_120/function_parameters.ts.snap
index f66f53e33c09..156eee866e50 100644
--- a/crates/biome_js_formatter/tests/specs/ts/function/parameters/line_width_120/function_parameters.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/function/parameters/line_width_120/function_parameters.ts.snap
@@ -56,7 +56,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -112,7 +112,7 @@ Line width: 120
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/es5/function_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/es5/function_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/es5/function_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/es5/function_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/es5/function_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/es5/function_trailing_commas.ts.snap
similarity index 96%
rename from crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/es5/function_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/es5/function_trailing_commas.ts.snap
index b23e8a3a3f8d..0777f3ebe031 100644
--- a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/es5/function_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/es5/function_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/function/trailing_comma/es5/function_trailing_comma.ts
+info: ts/function/trailing_commas/es5/function_trailing_commas.ts
 ---
 # Input
 
@@ -60,7 +60,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -120,7 +120,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: ES5
+Trailing commas: ES5
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/es5/options.json b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/es5/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/es5/options.json
rename to crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/es5/options.json
index 3872f183a485..1e34894c5c9f 100644
--- a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/es5/options.json
+++ b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/es5/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "es5"
+      "trailingCommas": "es5"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/none/function_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/none/function_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/none/function_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/none/function_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/none/function_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/none/function_trailing_commas.ts.snap
similarity index 96%
rename from crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/none/function_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/none/function_trailing_commas.ts.snap
index 2d5cbceddf02..b7d40faea8b1 100644
--- a/crates/biome_js_formatter/tests/specs/ts/function/trailing_comma/none/function_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/none/function_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/function/trailing_comma/none/function_trailing_comma.ts
+info: ts/function/trailing_commas/none/function_trailing_commas.ts
 ---
 # Input
 
@@ -60,7 +60,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -120,7 +120,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: None
+Trailing commas: None
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/none/options.json b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/none/options.json
new file mode 100644
index 000000000000..39962fb8149c
--- /dev/null
+++ b/crates/biome_js_formatter/tests/specs/ts/function/trailing_commas/none/options.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
+  "javascript": {
+    "formatter": {
+      "trailingCommas": "none"
+    }
+  }
+}
diff --git a/crates/biome_js_formatter/tests/specs/ts/issue1511.ts.snap b/crates/biome_js_formatter/tests/specs/ts/issue1511.ts.snap
index 1051e2504225..4a0dbcf40c58 100644
--- a/crates/biome_js_formatter/tests/specs/ts/issue1511.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/issue1511.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/issue1511.ts
 ---
-
 # Input
 
 ```ts
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -40,5 +39,3 @@ call(a, function (b: () => t1 | t2) {});
 
 call(a, (b: () => t1 | t2) => {});
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/module/export_clause.ts.snap b/crates/biome_js_formatter/tests/specs/ts/module/export_clause.ts.snap
index 0271f7d4287c..e2638fe7fc61 100644
--- a/crates/biome_js_formatter/tests/specs/ts/module/export_clause.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/module/export_clause.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/module/export_clause.ts
 ---
-
 # Input
 
 ```ts
@@ -46,7 +45,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -78,5 +77,3 @@ export type * from "types";
 
 export type * as types from "types";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/module/external_module_reference.ts.snap b/crates/biome_js_formatter/tests/specs/ts/module/external_module_reference.ts.snap
index 7dc336f3ffa7..ea2b5c7552b1 100644
--- a/crates/biome_js_formatter/tests/specs/ts/module/external_module_reference.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/module/external_module_reference.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/module/external_module_reference.ts
 ---
-
 # Input
 
 ```ts
@@ -27,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -40,5 +39,3 @@ import name = require("module_source");
 
 import name2 = require("other_source");
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/module/import_type/import_types.ts.snap b/crates/biome_js_formatter/tests/specs/ts/module/import_type/import_types.ts.snap
index 0edbdfa10a7c..5c19d02d8938 100644
--- a/crates/biome_js_formatter/tests/specs/ts/module/import_type/import_types.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/module/import_type/import_types.ts.snap
@@ -45,7 +45,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -81,7 +81,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: false
diff --git a/crates/biome_js_formatter/tests/specs/ts/module/module_declaration.ts.snap b/crates/biome_js_formatter/tests/specs/ts/module/module_declaration.ts.snap
index cbbab8e7ed7a..32b92586f6b1 100644
--- a/crates/biome_js_formatter/tests/specs/ts/module/module_declaration.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/module/module_declaration.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/module/module_declaration.ts
 ---
-
 # Input
 
 ```ts
@@ -28,7 +27,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -41,5 +40,3 @@ module singleName {}
 
 module qualified.name {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/module/qualified_module_name.ts.snap b/crates/biome_js_formatter/tests/specs/ts/module/qualified_module_name.ts.snap
index 627552138d4a..4eeb803fc912 100644
--- a/crates/biome_js_formatter/tests/specs/ts/module/qualified_module_name.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/module/qualified_module_name.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/module/qualified_module_name.ts
 ---
-
 # Input
 
 ```ts
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -36,5 +35,3 @@ Attribute Position: Auto
 ```ts
 module a.b.c {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/no-semi/class.ts.snap b/crates/biome_js_formatter/tests/specs/ts/no-semi/class.ts.snap
index 8bc74c59629c..d51fd899fc06 100644
--- a/crates/biome_js_formatter/tests/specs/ts/no-semi/class.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/no-semi/class.ts.snap
@@ -74,7 +74,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -146,7 +146,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/no-semi/non-null.ts.snap b/crates/biome_js_formatter/tests/specs/ts/no-semi/non-null.ts.snap
index dd9d77e27f5e..f5767a8fd92a 100644
--- a/crates/biome_js_formatter/tests/specs/ts/no-semi/non-null.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/no-semi/non-null.ts.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -50,7 +50,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/no-semi/statements.ts.snap b/crates/biome_js_formatter/tests/specs/ts/no-semi/statements.ts.snap
index 0213019da9b9..994cded7ce3e 100644
--- a/crates/biome_js_formatter/tests/specs/ts/no-semi/statements.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/no-semi/statements.ts.snap
@@ -37,7 +37,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -71,7 +71,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/no-semi/types.ts.snap b/crates/biome_js_formatter/tests/specs/ts/no-semi/types.ts.snap
index d80ab06d1789..96bd8c1332f9 100644
--- a/crates/biome_js_formatter/tests/specs/ts/no-semi/types.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/no-semi/types.ts.snap
@@ -36,7 +36,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -74,7 +74,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_es5/object_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_es5/object_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_es5/object_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_es5/object_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_es5/object_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_es5/object_trailing_commas.ts.snap
similarity index 95%
rename from crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_es5/object_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_es5/object_trailing_commas.ts.snap
index 65b1136f142f..aeb80ac27ec9 100644
--- a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_es5/object_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_es5/object_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/object/trailing_comma_es5/object_trailing_comma.ts
+info: ts/object/trailing_commas_es5/object_trailing_commas.ts
 ---
 # Input
 
@@ -45,7 +45,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -87,7 +87,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: ES5
+Trailing commas: ES5
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_es5/options.json b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_es5/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_es5/options.json
rename to crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_es5/options.json
index 376549ccea28..29c27399b2af 100644
--- a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_es5/options.json
+++ b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_es5/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "es5"
+      "trailingCommas": "es5"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_none/object_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_none/object_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_none/object_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_none/object_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_none/object_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_none/object_trailing_commas.ts.snap
similarity index 95%
rename from crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_none/object_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_none/object_trailing_commas.ts.snap
index e23a86bf3607..47370310521b 100644
--- a/crates/biome_js_formatter/tests/specs/ts/object/trailing_comma_none/object_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_none/object_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/object/trailing_comma_none/object_trailing_comma.ts
+info: ts/object/trailing_commas_none/object_trailing_commas.ts
 ---
 # Input
 
@@ -45,7 +45,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -87,7 +87,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: None
+Trailing commas: None
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_none/options.json b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_none/options.json
similarity index 81%
rename from crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_none/options.json
rename to crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_none/options.json
index 9af258d75592..ec98f8aeb828 100644
--- a/crates/biome_js_formatter/tests/specs/ts/enum/trailing_comma_none/options.json
+++ b/crates/biome_js_formatter/tests/specs/ts/object/trailing_commas_none/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "none"
+      "trailingCommas": "none"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/ts/parameters/issue-1356/parameter_type_annotation_semicolon.ts.snap b/crates/biome_js_formatter/tests/specs/ts/parameters/issue-1356/parameter_type_annotation_semicolon.ts.snap
index cc745aaf8548..a031e4e44209 100644
--- a/crates/biome_js_formatter/tests/specs/ts/parameters/issue-1356/parameter_type_annotation_semicolon.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/parameters/issue-1356/parameter_type_annotation_semicolon.ts.snap
@@ -32,7 +32,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -63,7 +63,7 @@ Line width: 40
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: As needed
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/parameters/parameters.ts.snap b/crates/biome_js_formatter/tests/specs/ts/parameters/parameters.ts.snap
index 114250e327a3..a19cb41da5b8 100644
--- a/crates/biome_js_formatter/tests/specs/ts/parameters/parameters.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/parameters/parameters.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/parameters/parameters.ts
 ---
-
 # Input
 
 ```ts
@@ -26,7 +25,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -37,5 +36,3 @@ Attribute Position: Auto
 ```ts
 function a(this: string) {}
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/parenthesis.ts.snap b/crates/biome_js_formatter/tests/specs/ts/parenthesis.ts.snap
index 30cea6a52a9c..bb23ded5aa2f 100644
--- a/crates/biome_js_formatter/tests/specs/ts/parenthesis.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/parenthesis.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/parenthesis.ts
 ---
-
 # Input
 
 ```ts
@@ -33,7 +32,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -53,5 +52,3 @@ type T3 = keyof (typeof obj)[number];
 type T4 = keyof (typeof obj)[number];
 type T5 = (keyof typeof obj)["toString"];
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/simple_arguments.ts.snap b/crates/biome_js_formatter/tests/specs/ts/simple_arguments.ts.snap
index 05d9704405b7..14ff0f9dd669 100644
--- a/crates/biome_js_formatter/tests/specs/ts/simple_arguments.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/simple_arguments.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/simple_arguments.ts
 ---
-
 # Input
 
 ```ts
@@ -71,7 +70,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -120,5 +119,3 @@ foo(() => {
 	foo;
 }, bar as MyCustomType[]);
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/statement/empty_block.ts.snap b/crates/biome_js_formatter/tests/specs/ts/statement/empty_block.ts.snap
index da893f6a12d7..6236f6a1c1ad 100644
--- a/crates/biome_js_formatter/tests/specs/ts/statement/empty_block.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/statement/empty_block.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/statement/empty_block.ts
 ---
-
 # Input
 
 ```ts
@@ -25,7 +24,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -37,5 +36,3 @@ Attribute Position: Auto
 interface X {}
 type X = {};
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/statement/enum_statement.ts.snap b/crates/biome_js_formatter/tests/specs/ts/statement/enum_statement.ts.snap
index f230f12e2594..6d4e3be0076f 100644
--- a/crates/biome_js_formatter/tests/specs/ts/statement/enum_statement.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/statement/enum_statement.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/statement/enum_statement.ts
 ---
-
 # Input
 
 ```ts
@@ -36,7 +35,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -63,5 +62,3 @@ const enum C {
 	F,
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/string/quotePreserve/parameter_quotes.ts.snap b/crates/biome_js_formatter/tests/specs/ts/string/quotePreserve/parameter_quotes.ts.snap
index 59e131ffcb52..91950a5333c4 100644
--- a/crates/biome_js_formatter/tests/specs/ts/string/quotePreserve/parameter_quotes.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/string/quotePreserve/parameter_quotes.ts.snap
@@ -58,7 +58,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -114,7 +114,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: Preserve
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/string/quoteSingle/parameter_quotes.ts.snap b/crates/biome_js_formatter/tests/specs/ts/string/quoteSingle/parameter_quotes.ts.snap
index f3648d3139e5..addf27f29cd5 100644
--- a/crates/biome_js_formatter/tests/specs/ts/string/quoteSingle/parameter_quotes.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/string/quoteSingle/parameter_quotes.ts.snap
@@ -58,7 +58,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -114,7 +114,7 @@ Line width: 80
 Quote style: Single Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/suppressions.ts.snap b/crates/biome_js_formatter/tests/specs/ts/suppressions.ts.snap
index 09b361cfd9d8..a4ebcfbf21bf 100644
--- a/crates/biome_js_formatter/tests/specs/ts/suppressions.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/suppressions.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/suppressions.ts
 ---
-
 # Input
 
 ```ts
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -46,5 +45,3 @@ interface Suppressions {
 	b: void;
 }
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/conditional.ts.snap b/crates/biome_js_formatter/tests/specs/ts/type/conditional.ts.snap
index 547992d047a0..7015d7012fc2 100644
--- a/crates/biome_js_formatter/tests/specs/ts/type/conditional.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/type/conditional.ts.snap
@@ -39,7 +39,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/import_type.ts.snap b/crates/biome_js_formatter/tests/specs/ts/type/import_type.ts.snap
index 932af4ef6bb3..fd7ea24a13f5 100644
--- a/crates/biome_js_formatter/tests/specs/ts/type/import_type.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/type/import_type.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/type/import_type.ts
 ---
-
 # Input
 
 ```ts
@@ -30,7 +29,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -45,5 +44,3 @@ type ImportType2 = import("source");
 
 type QualifiedImportType = typeof import("source").Qualified<TypeParams>;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/intersection_type.ts.snap b/crates/biome_js_formatter/tests/specs/ts/type/intersection_type.ts.snap
index d47ded23c2ab..b8a4275bfab4 100644
--- a/crates/biome_js_formatter/tests/specs/ts/type/intersection_type.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/type/intersection_type.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/type/intersection_type.ts
 ---
-
 # Input
 
 ```ts
@@ -82,7 +81,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -203,5 +202,3 @@ type SoftBreakBetweenNotObjectTypeInChain = {} & SomeLongType & {
 		somelonglonglongkey: SomeLongLongType;
 	} & { somelonglonglongkey: SomeLongLongType };
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/mapped_type.ts.snap b/crates/biome_js_formatter/tests/specs/ts/type/mapped_type.ts.snap
index 9a8512274e52..006ee7b174e7 100644
--- a/crates/biome_js_formatter/tests/specs/ts/type/mapped_type.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/type/mapped_type.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/type/mapped_type.ts
 ---
-
 # Input
 
 ```ts
@@ -31,7 +30,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -54,5 +53,3 @@ export type OmitIndexSignature<ObjectType> = {
 ```
     1: type LongNameHereToCauseLineBreak_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/qualified_name.ts.snap b/crates/biome_js_formatter/tests/specs/ts/type/qualified_name.ts.snap
index 7ee99da3693b..aa4346f2766d 100644
--- a/crates/biome_js_formatter/tests/specs/ts/type/qualified_name.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/type/qualified_name.ts.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: ts/type/qualified_name.ts
 ---
-
 # Input
 
 ```ts
@@ -24,7 +23,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -35,5 +34,3 @@ Attribute Position: Auto
 ```ts
 type QualifiedType = A.B.C;
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/template_type.ts.snap b/crates/biome_js_formatter/tests/specs/ts/type/template_type.ts.snap
index b30e583d0b17..058516c48d4b 100644
--- a/crates/biome_js_formatter/tests/specs/ts/type/template_type.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/type/template_type.ts.snap
@@ -26,7 +26,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/es5/options.json b/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/es5/options.json
deleted file mode 100644
index 3872f183a485..000000000000
--- a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/es5/options.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$schema": "../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
-  "javascript": {
-    "formatter": {
-      "trailingComma": "es5"
-    }
-  }
-}
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/none/options.json b/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/none/options.json
deleted file mode 100644
index ca3ca7e7c84d..000000000000
--- a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/none/options.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "$schema": "../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
-  "javascript": {
-    "formatter": {
-      "trailingComma": "none"
-    }
-  }
-}
diff --git a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/none/options.json b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/es5/options.json
similarity index 82%
rename from crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/none/options.json
rename to crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/es5/options.json
index ca3ca7e7c84d..1e34894c5c9f 100644
--- a/crates/biome_js_formatter/tests/specs/ts/class/trailing_comma/none/options.json
+++ b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/es5/options.json
@@ -2,7 +2,7 @@
   "$schema": "../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
   "javascript": {
     "formatter": {
-      "trailingComma": "none"
+      "trailingCommas": "es5"
     }
   }
 }
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/es5/type_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/es5/type_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/es5/type_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/es5/type_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/es5/type_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/es5/type_trailing_commas.ts.snap
similarity index 93%
rename from crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/es5/type_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/es5/type_trailing_commas.ts.snap
index 2d586c5ea4e8..2a565ce7685e 100644
--- a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/es5/type_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/es5/type_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/type/trailing-comma/es5/type_trailing_comma.ts
+info: ts/type/trailing-commas/es5/type_trailing_commas.ts
 ---
 # Input
 
@@ -35,7 +35,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -67,7 +67,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: ES5
+Trailing commas: ES5
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/none/options.json b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/none/options.json
new file mode 100644
index 000000000000..39962fb8149c
--- /dev/null
+++ b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/none/options.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "../../../../../../../../packages/@biomejs/biome/configuration_schema.json",
+  "javascript": {
+    "formatter": {
+      "trailingCommas": "none"
+    }
+  }
+}
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/none/type_trailing_comma.ts b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/none/type_trailing_commas.ts
similarity index 100%
rename from crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/none/type_trailing_comma.ts
rename to crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/none/type_trailing_commas.ts
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/none/type_trailing_comma.ts.snap b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/none/type_trailing_commas.ts.snap
similarity index 93%
rename from crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/none/type_trailing_comma.ts.snap
rename to crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/none/type_trailing_commas.ts.snap
index 1e4dcdfdcd27..9c3e3ff11089 100644
--- a/crates/biome_js_formatter/tests/specs/ts/type/trailing-comma/none/type_trailing_comma.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/type/trailing-commas/none/type_trailing_commas.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/biome_formatter_test/src/snapshot_builder.rs
-info: ts/type/trailing-comma/none/type_trailing_comma.ts
+info: ts/type/trailing-commas/none/type_trailing_commas.ts
 ---
 # Input
 
@@ -35,7 +35,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -67,7 +67,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: None
+Trailing commas: None
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/type/union_type.ts.snap b/crates/biome_js_formatter/tests/specs/ts/type/union_type.ts.snap
index 943c217adbd2..41c4e2bdc492 100644
--- a/crates/biome_js_formatter/tests/specs/ts/type/union_type.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/type/union_type.ts.snap
@@ -272,7 +272,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/ts/union/nested_union/nested_union.ts.snap b/crates/biome_js_formatter/tests/specs/ts/union/nested_union/nested_union.ts.snap
index 03bab4fd5b71..90c16fbe9158 100644
--- a/crates/biome_js_formatter/tests/specs/ts/union/nested_union/nested_union.ts.snap
+++ b/crates/biome_js_formatter/tests/specs/ts/union/nested_union/nested_union.ts.snap
@@ -35,7 +35,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -68,7 +68,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/tsx/arrow/issue-2736.tsx.snap b/crates/biome_js_formatter/tests/specs/tsx/arrow/issue-2736.tsx.snap
index e34c9e6ebdee..3bd80102afc0 100644
--- a/crates/biome_js_formatter/tests/specs/tsx/arrow/issue-2736.tsx.snap
+++ b/crates/biome_js_formatter/tests/specs/tsx/arrow/issue-2736.tsx.snap
@@ -42,7 +42,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
diff --git a/crates/biome_js_formatter/tests/specs/tsx/smoke.tsx.snap b/crates/biome_js_formatter/tests/specs/tsx/smoke.tsx.snap
index 91a490f0a0c8..3b89cb0920b5 100644
--- a/crates/biome_js_formatter/tests/specs/tsx/smoke.tsx.snap
+++ b/crates/biome_js_formatter/tests/specs/tsx/smoke.tsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: tsx/smoke.tsx
 ---
-
 # Input
 
 ```tsx
@@ -24,7 +23,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -35,5 +34,3 @@ Attribute Position: Auto
 ```tsx
 "foo";
 ```
-
-
diff --git a/crates/biome_js_formatter/tests/specs/tsx/type_param.tsx.snap b/crates/biome_js_formatter/tests/specs/tsx/type_param.tsx.snap
index 283d088ba68e..a236259ac825 100644
--- a/crates/biome_js_formatter/tests/specs/tsx/type_param.tsx.snap
+++ b/crates/biome_js_formatter/tests/specs/tsx/type_param.tsx.snap
@@ -2,7 +2,6 @@
 source: crates/biome_formatter_test/src/snapshot_builder.rs
 info: tsx/type_param.tsx
 ---
-
 # Input
 
 ```tsx
@@ -38,7 +37,7 @@ Line width: 80
 Quote style: Double Quotes
 JSX quote style: Double Quotes
 Quote properties: As needed
-Trailing comma: All
+Trailing commas: All
 Semicolons: Always
 Arrow parentheses: Always
 Bracket spacing: true
@@ -62,5 +61,3 @@ class A<T> {}
 class B<T> {}
 class C<T, D> {}
 ```
-
-
diff --git a/crates/biome_json_analyze/src/lib.rs b/crates/biome_json_analyze/src/lib.rs
index 81bd47c7f7b3..523022af3df0 100644
--- a/crates/biome_json_analyze/src/lib.rs
+++ b/crates/biome_json_analyze/src/lib.rs
@@ -1,6 +1,7 @@
 mod lint;
 pub mod options;
 mod registry;
+pub mod utils;
 
 pub use crate::registry::visit_registry;
 use biome_analyze::{
diff --git a/crates/biome_json_analyze/src/utils.rs b/crates/biome_json_analyze/src/utils.rs
new file mode 100644
index 000000000000..30586fde4bbb
--- /dev/null
+++ b/crates/biome_json_analyze/src/utils.rs
@@ -0,0 +1,48 @@
+use biome_json_syntax::{JsonMember, JsonMemberList, JsonMemberName, JsonObjectValue};
+use biome_rowan::AstNode;
+
+/// Mathes a JSON member name node against a path
+pub fn matches_path(optional_node: Option<&JsonMemberName>, path: &[&str]) -> bool {
+    if path.is_empty() {
+        return true;
+    }
+
+    let Some(node) = optional_node else {
+        return false;
+    };
+
+    if !node
+        .inner_string_text()
+        .is_ok_and(|text| Some(&text.text()) == path.last())
+    {
+        return false;
+    }
+
+    let optional_parent_node = node
+        .syntax()
+        .parent()
+        .and_then(|p| {
+            if JsonMember::can_cast(p.kind()) {
+                p.parent()
+            } else {
+                None
+            }
+        })
+        .and_then(|p| {
+            if JsonMemberList::can_cast(p.kind()) {
+                p.parent()
+            } else {
+                None
+            }
+        })
+        .and_then(|p| {
+            if JsonObjectValue::can_cast(p.kind()) {
+                p.parent()
+            } else {
+                None
+            }
+        })
+        .and_then(|p| JsonMember::try_cast(p).ok()?.name().ok());
+
+    matches_path(optional_parent_node.as_ref(), &path[..path.len() - 1])
+}
diff --git a/crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_comma.json b/crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_commas.json
similarity index 100%
rename from crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_comma.json
rename to crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_commas.json
diff --git a/crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_comma.json.snap b/crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_commas.json.snap
similarity index 88%
rename from crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_comma.json.snap
rename to crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_commas.json.snap
index 60d13d0ecfff..58e4921bcdd7 100644
--- a/crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_comma.json.snap
+++ b/crates/biome_json_parser/tests/json_test_suite/err/array_unclosed_trailing_commas.json.snap
@@ -2,7 +2,6 @@
 source: crates/biome_json_parser/tests/spec_test.rs
 expression: snapshot
 ---
-
 ## Input
 
 ```json
@@ -48,7 +47,7 @@ JsonRoot {
 ## Diagnostics
 
 ```
-array_unclosed_trailing_comma.json:1:4 parse ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+array_unclosed_trailing_commas.json:1:4 parse ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
   × Expected an array, an object, or a literal but instead found the end of the file.
   
@@ -61,5 +60,3 @@ array_unclosed_trailing_comma.json:1:4 parse ━━━━━━━━━━━
       │    
   
 ```
-
-
diff --git a/crates/biome_json_parser/tests/json_test_suite/err/object_trailing_comma.json.snap b/crates/biome_json_parser/tests/json_test_suite/err/object_trailing_comma.json.snap
index 54d7b25889e7..70d25e7ec6b3 100644
--- a/crates/biome_json_parser/tests/json_test_suite/err/object_trailing_comma.json.snap
+++ b/crates/biome_json_parser/tests/json_test_suite/err/object_trailing_comma.json.snap
@@ -2,7 +2,6 @@
 source: crates/biome_json_parser/tests/spec_test.rs
 expression: snapshot
 ---
-
 ## Input
 
 ```json
@@ -71,5 +70,3 @@ object_trailing_comma.json:1:9 parse ━━━━━━━━━━━━━━
       │         ^
   
 ```
-
-
diff --git a/crates/biome_migrate/Cargo.toml b/crates/biome_migrate/Cargo.toml
index 83ad0e82abe6..fd28e8c23b5a 100644
--- a/crates/biome_migrate/Cargo.toml
+++ b/crates/biome_migrate/Cargo.toml
@@ -17,6 +17,7 @@ version              = "0.0.0"
 biome_analyze      = { workspace = true }
 biome_console      = { workspace = true }
 biome_diagnostics  = { workspace = true }
+biome_json_analyze = { workspace = true }
 biome_json_factory = { workspace = true }
 biome_json_syntax  = { workspace = true }
 biome_rowan        = { workspace = true }
diff --git a/crates/biome_migrate/src/analyzers.rs b/crates/biome_migrate/src/analyzers.rs
index 501955c9a969..c1787c8f3170 100644
--- a/crates/biome_migrate/src/analyzers.rs
+++ b/crates/biome_migrate/src/analyzers.rs
@@ -1,10 +1,13 @@
 use crate::analyzers::indent_size::IndentSize;
 use crate::analyzers::schema::Schema;
+use crate::analyzers::trailing_comma::TrailingComma;
+
 use biome_analyze::{GroupCategory, RegistryVisitor, RuleCategory, RuleGroup};
 use biome_json_syntax::JsonLanguage;
 
 mod indent_size;
 mod schema;
+mod trailing_comma;
 
 pub(crate) struct MigrationGroup;
 pub(crate) struct MigrationCategory;
@@ -19,7 +22,9 @@ impl RuleGroup for MigrationGroup {
         // v1.3.0
         registry.record_rule::<IndentSize>();
         // v1.5.0
-        registry.record_rule::<Schema>()
+        registry.record_rule::<Schema>();
+        // vNext
+        registry.record_rule::<TrailingComma>();
     }
 }
 
diff --git a/crates/biome_migrate/src/analyzers/indent_size.rs b/crates/biome_migrate/src/analyzers/indent_size.rs
index 4b92eb2d0a62..837209b5ef63 100644
--- a/crates/biome_migrate/src/analyzers/indent_size.rs
+++ b/crates/biome_migrate/src/analyzers/indent_size.rs
@@ -3,6 +3,7 @@ use biome_analyze::context::RuleContext;
 use biome_analyze::{ActionCategory, Ast, Rule, RuleAction, RuleDiagnostic};
 use biome_console::markup;
 use biome_diagnostics::{category, Applicability};
+use biome_json_analyze::utils::matches_path;
 use biome_json_factory::make::{ident, json_member_name};
 use biome_json_syntax::JsonMemberName;
 use biome_rowan::{AstNode, BatchMutationExt};
@@ -23,11 +24,11 @@ impl Rule for IndentSize {
     fn run(ctx: &RuleContext<Self>) -> Self::Signals {
         let node = ctx.query();
 
-        let node_text = node.inner_string_text().ok()?;
-        if node_text.text() == "indentSize" {
-            return Some(());
+        if matches_path(Some(node), &["formatter", "indentSize"]) {
+            Some(())
+        } else {
+            None
         }
-        None
     }
 
     fn diagnostic(ctx: &RuleContext<Self>, _state: &Self::State) -> Option<RuleDiagnostic> {
@@ -37,7 +38,7 @@ impl Rule for IndentSize {
                 category!("migrate"),
                 node.range(),
                 markup! {
-                    "The option "<Emphasis>"indentSize"</Emphasis>" is deprecated."
+                    "The option "<Emphasis>"formatter.indentSize"</Emphasis>" is deprecated."
                 }
                 .to_owned(),
             )
@@ -56,7 +57,7 @@ impl Rule for IndentSize {
             category: ActionCategory::QuickFix,
             applicability: Applicability::Always,
             message: markup! {
-                "Use the property "<Emphasis>"indentWidth"</Emphasis>" instead."
+                "Use the property "<Emphasis>"formatter.indentWidth"</Emphasis>" instead."
             }
             .to_owned(),
             mutation,
diff --git a/crates/biome_migrate/src/analyzers/trailing_comma.rs b/crates/biome_migrate/src/analyzers/trailing_comma.rs
new file mode 100644
index 000000000000..4af11e2d5c6b
--- /dev/null
+++ b/crates/biome_migrate/src/analyzers/trailing_comma.rs
@@ -0,0 +1,66 @@
+use crate::{declare_migration, MigrationAction};
+use biome_analyze::context::RuleContext;
+use biome_analyze::{ActionCategory, Ast, Rule, RuleAction, RuleDiagnostic};
+use biome_console::markup;
+use biome_diagnostics::{category, Applicability};
+use biome_json_analyze::utils::matches_path;
+use biome_json_factory::make::{ident, json_member_name};
+use biome_json_syntax::JsonMemberName;
+use biome_rowan::{AstNode, BatchMutationExt};
+
+declare_migration! {
+    pub(crate) TrailingComma {
+        version: "next",
+        name: "trailingComma",
+    }
+}
+
+impl Rule for TrailingComma {
+    type Query = Ast<JsonMemberName>;
+    type State = ();
+    type Signals = Option<Self::State>;
+    type Options = ();
+
+    fn run(ctx: &RuleContext<Self>) -> Self::Signals {
+        let node = ctx.query();
+
+        if matches_path(Some(node), &["javascript", "formatter", "trailingComma"]) {
+            Some(())
+        } else {
+            None
+        }
+    }
+
+    fn diagnostic(ctx: &RuleContext<Self>, _state: &Self::State) -> Option<RuleDiagnostic> {
+        let node = ctx.query();
+        Some(
+            RuleDiagnostic::new(
+                category!("migrate"),
+                node.range(),
+                markup! {
+                    "The option "<Emphasis>"javascript.formatter.trailingComma"</Emphasis>" is deprecated."
+                }
+                .to_owned(),
+            )
+            .deprecated(),
+        )
+    }
+
+    fn action(ctx: &RuleContext<Self>, _state: &Self::State) -> Option<MigrationAction> {
+        let node = ctx.query();
+        let mut mutation = ctx.root().begin();
+
+        let new_node = json_member_name(ident("\"trailingCommas\""));
+        mutation.replace_node(node.clone(), new_node);
+
+        Some(RuleAction {
+            category: ActionCategory::QuickFix,
+            applicability: Applicability::Always,
+            message: markup! {
+                "Use the property "<Emphasis>"javascript.formatter.trailingCommas"</Emphasis>" instead."
+            }
+            .to_owned(),
+            mutation,
+        })
+    }
+}
diff --git a/crates/biome_migrate/src/lib.rs b/crates/biome_migrate/src/lib.rs
index 3f5b72c90a56..d1ef9ee32592 100644
--- a/crates/biome_migrate/src/lib.rs
+++ b/crates/biome_migrate/src/lib.rs
@@ -126,7 +126,24 @@ mod test {
     #[ignore]
     fn quick_test() {
         let source = r#"{
-	"$schema": "https://biomejs.dev/schemas/1.0.0/schema.json"
+	"$schema": "https://biomejs.dev/schemas/1.0.0/schema.json",
+	"javascript": {
+		"formatter": {
+			"trailingComma": "all",
+			"indentSize": 2
+		}
+	},
+	"overrides": [
+		{
+			"include": ["scripts/**"],
+			"javascript": {
+				"formatter": {
+					"trailingComma": "es5",
+					"indentSize": 4
+				}
+			}
+		}
+	]
 }
 "#;
 
diff --git a/crates/biome_migrate/tests/specs/migrations/indentSize/invalid.json.snap b/crates/biome_migrate/tests/specs/migrations/indentSize/invalid.json.snap
index 7adc3fd09f69..ad0eda592bc8 100644
--- a/crates/biome_migrate/tests/specs/migrations/indentSize/invalid.json.snap
+++ b/crates/biome_migrate/tests/specs/migrations/indentSize/invalid.json.snap
@@ -26,7 +26,7 @@ expression: invalid.json
 ```
 invalid.json:3:3 migrate  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-  ! The option indentSize is deprecated.
+  ! The option formatter.indentSize is deprecated.
   
     1 │ {
     2 │ 	"formatter": {
@@ -35,7 +35,7 @@ invalid.json:3:3 migrate  FIXABLE  ━━━━━━━━━━━━━━━
     4 │ 	},
     5 │ 	"javascript": {
   
-  i Safe fix: Use the property indentWidth instead.
+  i Safe fix: Use the property formatter.indentWidth instead.
   
      1  1 │   {
      2  2 │   	"formatter": {
@@ -50,7 +50,7 @@ invalid.json:3:3 migrate  FIXABLE  ━━━━━━━━━━━━━━━
 ```
 invalid.json:7:4 migrate  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-  ! The option indentSize is deprecated.
+  ! The option formatter.indentSize is deprecated.
   
     5 │ 	"javascript": {
     6 │ 		"formatter": {
@@ -59,7 +59,7 @@ invalid.json:7:4 migrate  FIXABLE  ━━━━━━━━━━━━━━━
     8 │ 		}
     9 │ 	},
   
-  i Safe fix: Use the property indentWidth instead.
+  i Safe fix: Use the property formatter.indentWidth instead.
   
      5  5 │   	"javascript": {
      6  6 │   		"formatter": {
@@ -74,7 +74,7 @@ invalid.json:7:4 migrate  FIXABLE  ━━━━━━━━━━━━━━━
 ```
 invalid.json:12:4 migrate  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-  ! The option indentSize is deprecated.
+  ! The option formatter.indentSize is deprecated.
   
     10 │ 	"json": {
     11 │ 		"formatter": {
@@ -83,7 +83,7 @@ invalid.json:12:4 migrate  FIXABLE  ━━━━━━━━━━━━━━
     13 │ 		}
     14 │ 	}
   
-  i Safe fix: Use the property indentWidth instead.
+  i Safe fix: Use the property formatter.indentWidth instead.
   
     10 10 │   	"json": {
     11 11 │   		"formatter": {
@@ -94,5 +94,3 @@ invalid.json:12:4 migrate  FIXABLE  ━━━━━━━━━━━━━━
   
 
 ```
-
-
diff --git a/crates/biome_migrate/tests/specs/migrations/trailingComma/invalid.json b/crates/biome_migrate/tests/specs/migrations/trailingComma/invalid.json
new file mode 100644
index 000000000000..a01b95af3975
--- /dev/null
+++ b/crates/biome_migrate/tests/specs/migrations/trailingComma/invalid.json
@@ -0,0 +1,17 @@
+{
+	"javascript": {
+		"formatter": {
+			"trailingComma": "all"
+		}
+	},
+	"overrides": [
+		{
+			"include": ["scripts/**"],
+			"javascript": {
+				"formatter": {
+					"trailingComma": "es5"
+				}
+			}
+		}
+	]
+}
diff --git a/crates/biome_migrate/tests/specs/migrations/trailingComma/invalid.json.snap b/crates/biome_migrate/tests/specs/migrations/trailingComma/invalid.json.snap
new file mode 100644
index 000000000000..63a44ef05877
--- /dev/null
+++ b/crates/biome_migrate/tests/specs/migrations/trailingComma/invalid.json.snap
@@ -0,0 +1,74 @@
+---
+source: crates/biome_migrate/tests/spec_tests.rs
+expression: invalid.json
+---
+# Input
+```json
+{
+	"javascript": {
+		"formatter": {
+			"trailingComma": "all"
+		}
+	},
+	"overrides": [
+		{
+			"include": ["scripts/**"],
+			"javascript": {
+				"formatter": {
+					"trailingComma": "es5"
+				}
+			}
+		}
+	]
+}
+
+```
+
+# Diagnostics
+```
+invalid.json:4:4 migrate  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  ! The option javascript.formatter.trailingComma is deprecated.
+  
+    2 │ 	"javascript": {
+    3 │ 		"formatter": {
+  > 4 │ 			"trailingComma": "all"
+      │ 			^^^^^^^^^^^^^^^
+    5 │ 		}
+    6 │ 	},
+  
+  i Safe fix: Use the property javascript.formatter.trailingCommas instead.
+  
+     2  2 │   	"javascript": {
+     3  3 │   		"formatter": {
+     4    │ - → → → "trailingComma":·"all"
+        4 │ + → → → "trailingCommas":·"all"
+     5  5 │   		}
+     6  6 │   	},
+  
+
+```
+
+```
+invalid.json:12:6 migrate  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  ! The option javascript.formatter.trailingComma is deprecated.
+  
+    10 │ 			"javascript": {
+    11 │ 				"formatter": {
+  > 12 │ 					"trailingComma": "es5"
+       │ 					^^^^^^^^^^^^^^^
+    13 │ 				}
+    14 │ 			}
+  
+  i Safe fix: Use the property javascript.formatter.trailingCommas instead.
+  
+    10 10 │   			"javascript": {
+    11 11 │   				"formatter": {
+    12    │ - → → → → → "trailingComma":·"es5"
+       12 │ + → → → → → "trailingCommas":·"es5"
+    13 13 │   				}
+    14 14 │   			}
+  
+
+```
diff --git a/crates/biome_service/src/configuration.rs b/crates/biome_service/src/configuration.rs
index fb9b618f29ca..9b5fb8dffb0a 100644
--- a/crates/biome_service/src/configuration.rs
+++ b/crates/biome_service/src/configuration.rs
@@ -505,6 +505,10 @@ impl PartialConfigurationExt for PartialConfiguration {
             if formatter.indent_size.is_some() && formatter.indent_width.is_none() {
                 formatter.indent_width = formatter.indent_size;
             }
+
+            if formatter.trailing_comma.is_some() && formatter.trailing_commas.is_none() {
+                formatter.trailing_commas = formatter.trailing_comma;
+            }
         }
 
         // TODO: remove in biome 2.0
diff --git a/crates/biome_service/src/file_handlers/javascript.rs b/crates/biome_service/src/file_handlers/javascript.rs
index ae2d725d6cdd..aa60be429751 100644
--- a/crates/biome_service/src/file_handlers/javascript.rs
+++ b/crates/biome_service/src/file_handlers/javascript.rs
@@ -34,7 +34,7 @@ use biome_js_analyze::utils::rename::{RenameError, RenameSymbolExtensions};
 use biome_js_analyze::{
     analyze, analyze_with_inspect_matcher, visit_registry, ControlFlowGraph, RuleError,
 };
-use biome_js_formatter::context::trailing_comma::TrailingComma;
+use biome_js_formatter::context::trailing_commas::TrailingCommas;
 use biome_js_formatter::context::{
     ArrowParentheses, BracketSameLine, BracketSpacing, JsFormatOptions, QuoteProperties, Semicolons,
 };
@@ -58,7 +58,7 @@ pub struct JsFormatterSettings {
     pub quote_style: Option<QuoteStyle>,
     pub jsx_quote_style: Option<QuoteStyle>,
     pub quote_properties: Option<QuoteProperties>,
-    pub trailing_comma: Option<TrailingComma>,
+    pub trailing_commas: Option<TrailingCommas>,
     pub semicolons: Option<Semicolons>,
     pub arrow_parentheses: Option<ArrowParentheses>,
     pub bracket_spacing: Option<BracketSpacing>,
@@ -151,7 +151,7 @@ impl ServiceLanguage for JsLanguage {
         .with_quote_style(language.quote_style.unwrap_or_default())
         .with_jsx_quote_style(language.jsx_quote_style.unwrap_or_default())
         .with_quote_properties(language.quote_properties.unwrap_or_default())
-        .with_trailing_comma(language.trailing_comma.unwrap_or_default())
+        .with_trailing_commas(language.trailing_commas.unwrap_or_default())
         .with_semicolons(language.semicolons.unwrap_or_default())
         .with_arrow_parentheses(language.arrow_parentheses.unwrap_or_default())
         .with_bracket_spacing(language.bracket_spacing.unwrap_or_default())
diff --git a/crates/biome_service/src/settings.rs b/crates/biome_service/src/settings.rs
index 109fc332bf71..2f3f310cc8b3 100644
--- a/crates/biome_service/src/settings.rs
+++ b/crates/biome_service/src/settings.rs
@@ -432,7 +432,7 @@ impl From<JavascriptConfiguration> for LanguageSettings<JsLanguage> {
         language_setting.formatter.quote_style = Some(formatter.quote_style);
         language_setting.formatter.jsx_quote_style = Some(formatter.jsx_quote_style);
         language_setting.formatter.quote_properties = Some(formatter.quote_properties);
-        language_setting.formatter.trailing_comma = Some(formatter.trailing_comma);
+        language_setting.formatter.trailing_commas = Some(formatter.trailing_commas);
         language_setting.formatter.semicolons = Some(formatter.semicolons);
         language_setting.formatter.arrow_parentheses = Some(formatter.arrow_parentheses);
         language_setting.formatter.bracket_spacing = Some(formatter.bracket_spacing.into());
@@ -965,8 +965,8 @@ impl OverrideSettingPattern {
         if let Some(quote_properties) = js_formatter.quote_properties {
             options.set_quote_properties(quote_properties);
         }
-        if let Some(trailing_comma) = js_formatter.trailing_comma {
-            options.set_trailing_comma(trailing_comma);
+        if let Some(trailing_commas) = js_formatter.trailing_commas {
+            options.set_trailing_commas(trailing_commas);
         }
         if let Some(semicolons) = js_formatter.semicolons {
             options.set_semicolons(semicolons);
@@ -1273,8 +1273,10 @@ fn to_javascript_language_settings(
     language_setting.formatter.quote_properties = formatter
         .quote_properties
         .or(parent_formatter.quote_properties);
-    language_setting.formatter.trailing_comma =
-        formatter.trailing_comma.or(parent_formatter.trailing_comma);
+    language_setting.formatter.trailing_commas = formatter
+        .trailing_commas
+        .or(formatter.trailing_comma)
+        .or(parent_formatter.trailing_commas);
     language_setting.formatter.semicolons = formatter.semicolons.or(parent_formatter.semicolons);
     language_setting.formatter.arrow_parentheses = formatter
         .arrow_parentheses
diff --git a/crates/biome_service/tests/invalid/javascript_formatter_trailing_comma.json.snap b/crates/biome_service/tests/invalid/javascript_formatter_trailing_comma.json.snap
deleted file mode 100644
index 37b5a8ea9a86..000000000000
--- a/crates/biome_service/tests/invalid/javascript_formatter_trailing_comma.json.snap
+++ /dev/null
@@ -1,23 +0,0 @@
----
-source: crates/biome_service/tests/spec_tests.rs
-expression: javascript_formatter_trailing_comma.json
----
-javascript_formatter_trailing_comma.json:4:21 deserialize ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-  × Found an unknown value `wrong`.
-  
-    2 │ 	"javascript": {
-    3 │ 		"formatter": {
-  > 4 │ 			"trailingComma": "wrong"
-      │ 			                 ^^^^^^^
-    5 │ 		}
-    6 │ 	}
-  
-  i Accepted values:
-  
-  - all
-  - es5
-  - none
-  
-
-
diff --git a/crates/biome_service/tests/invalid/javascript_formatter_trailing_comma.json b/crates/biome_service/tests/invalid/javascript_formatter_trailing_commas.json
similarity index 60%
rename from crates/biome_service/tests/invalid/javascript_formatter_trailing_comma.json
rename to crates/biome_service/tests/invalid/javascript_formatter_trailing_commas.json
index 6b88c81db221..85b4618b62be 100644
--- a/crates/biome_service/tests/invalid/javascript_formatter_trailing_comma.json
+++ b/crates/biome_service/tests/invalid/javascript_formatter_trailing_commas.json
@@ -1,7 +1,7 @@
 {
 	"javascript": {
 		"formatter": {
-			"trailingComma": "wrong"
+			"trailingCommas": "wrong"
 		}
 	}
 }
diff --git a/crates/biome_service/tests/invalid/javascript_formatter_trailing_commas.json.snap b/crates/biome_service/tests/invalid/javascript_formatter_trailing_commas.json.snap
new file mode 100644
index 000000000000..a003163b43b5
--- /dev/null
+++ b/crates/biome_service/tests/invalid/javascript_formatter_trailing_commas.json.snap
@@ -0,0 +1,20 @@
+---
+source: crates/biome_service/tests/spec_tests.rs
+expression: javascript_formatter_trailing_commas.json
+---
+javascript_formatter_trailing_commas.json:4:22 deserialize ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Found an unknown value `wrong`.
+  
+    2 │ 	"javascript": {
+    3 │ 		"formatter": {
+  > 4 │ 			"trailingCommas": "wrong"
+      │ 			                  ^^^^^^^
+    5 │ 		}
+    6 │ 	}
+  
+  i Accepted values:
+  
+  - all
+  - es5
+  - none
diff --git a/crates/biome_service/tests/valid/base_options_inside_css.json b/crates/biome_service/tests/valid/base_options_inside_css.json
index d5310d2e378b..6d75475d8a51 100644
--- a/crates/biome_service/tests/valid/base_options_inside_css.json
+++ b/crates/biome_service/tests/valid/base_options_inside_css.json
@@ -1,13 +1,13 @@
 {
 	"$schema": "../../../../packages/@biomejs/biome/configuration_schema.json",
 	"formatter": {
-		"indentSize": 2
+		"indentWidth": 2
 	},
 	"css": {
 		"formatter": {
 			"enabled": true,
 			"indentStyle": "space",
-			"indentSize": 2,
+			"indentWidth": 2,
 			"lineEnding": "lf",
 			"lineWidth": 200,
 			"quoteStyle": "single"
diff --git a/crates/biome_service/tests/valid/base_options_inside_javascript.json b/crates/biome_service/tests/valid/base_options_inside_javascript.json
index 106548610973..7c4979cfea74 100644
--- a/crates/biome_service/tests/valid/base_options_inside_javascript.json
+++ b/crates/biome_service/tests/valid/base_options_inside_javascript.json
@@ -1,13 +1,14 @@
 {
 	"$schema": "../../../../packages/@biomejs/biome/configuration_schema.json",
 	"formatter": {
-		"indentSize": 2
+		"indentWidth": 2
 	},
 	"javascript": {
 		"formatter": {
 			"enabled": true,
 			"indentStyle": "space",
-			"indentSize": 2,
+			"indentWidth": 2,
+			"trailingCommas": "all",
 			"lineEnding": "lf",
 			"lineWidth": 200,
 			"quoteStyle": "single"
diff --git a/crates/biome_service/tests/valid/base_options_inside_json.json b/crates/biome_service/tests/valid/base_options_inside_json.json
index 857a4b957bff..1debe86d630d 100644
--- a/crates/biome_service/tests/valid/base_options_inside_json.json
+++ b/crates/biome_service/tests/valid/base_options_inside_json.json
@@ -1,13 +1,13 @@
 {
 	"$schema": "../../../../packages/@biomejs/biome/configuration_schema.json",
 	"formatter": {
-		"indentSize": 2
+		"indentWidth": 2
 	},
 	"json": {
 		"formatter": {
 			"enabled": true,
 			"indentStyle": "space",
-			"indentSize": 2,
+			"indentWidth": 2,
 			"lineEnding": "lf",
 			"lineWidth": 200
 		}
diff --git a/crates/biome_service/tests/valid/deprecated_options_inside_javascript.json b/crates/biome_service/tests/valid/deprecated_options_inside_javascript.json
new file mode 100644
index 000000000000..07b1105ec0a9
--- /dev/null
+++ b/crates/biome_service/tests/valid/deprecated_options_inside_javascript.json
@@ -0,0 +1,13 @@
+{
+	"$schema": "../../../../packages/@biomejs/biome/configuration_schema.json",
+	"formatter": {
+		"indentSize": 2
+	},
+	"javascript": {
+		"formatter": {
+			"enabled": true,
+			"indentSize": 2,
+			"trailingComma": "all"
+		}
+	}
+}
\ No newline at end of file
diff --git a/packages/@biomejs/backend-jsonrpc/src/workspace.ts b/packages/@biomejs/backend-jsonrpc/src/workspace.ts
index 1e99b16caa4f..5cd6aef5dc7b 100644
--- a/packages/@biomejs/backend-jsonrpc/src/workspace.ts
+++ b/packages/@biomejs/backend-jsonrpc/src/workspace.ts
@@ -354,7 +354,11 @@ export interface PartialJavascriptFormatter {
 	/**
 	 * Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to "all".
 	 */
-	trailingComma?: TrailingComma;
+	trailingComma?: TrailingCommas;
+	/**
+	 * Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to "all".
+	 */
+	trailingCommas?: TrailingCommas;
 }
 /**
  * Indicates the type of runtime or transformation used for interpreting JSX.
@@ -400,7 +404,7 @@ export interface PartialJsonFormatter {
 	/**
 	 * Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to "none".
 	 */
-	trailingCommas?: TrailingCommas;
+	trailingCommas?: TrailingCommas2;
 }
 /**
  * Options that changes how the JSON parser behaves
@@ -475,8 +479,8 @@ export type Semicolons = "always" | "asNeeded";
 /**
  * Print trailing commas wherever possible in multi-line comma-separated syntactic structures.
  */
-export type TrailingComma = "all" | "es5" | "none";
-export type TrailingCommas = "none" | "all";
+export type TrailingCommas = "all" | "es5" | "none";
+export type TrailingCommas2 = "none" | "all";
 /**
  * A list of rules that belong to this group
  */
diff --git a/packages/@biomejs/biome/configuration_schema.json b/packages/@biomejs/biome/configuration_schema.json
index 79802d8a2fce..5a13e5ca1b20 100644
--- a/packages/@biomejs/biome/configuration_schema.json
+++ b/packages/@biomejs/biome/configuration_schema.json
@@ -1239,7 +1239,14 @@
 				"trailingComma": {
 					"description": "Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to \"all\".",
 					"anyOf": [
-						{ "$ref": "#/definitions/TrailingComma" },
+						{ "$ref": "#/definitions/TrailingCommas" },
+						{ "type": "null" }
+					]
+				},
+				"trailingCommas": {
+					"description": "Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to \"all\".",
+					"anyOf": [
+						{ "$ref": "#/definitions/TrailingCommas" },
 						{ "type": "null" }
 					]
 				}
@@ -1316,7 +1323,7 @@
 				"trailingCommas": {
 					"description": "Print trailing commas wherever possible in multi-line comma-separated syntactic structures. Defaults to \"none\".",
 					"anyOf": [
-						{ "$ref": "#/definitions/TrailingCommas" },
+						{ "$ref": "#/definitions/TrailingCommas2" },
 						{ "type": "null" }
 					]
 				}
@@ -3009,7 +3016,7 @@
 			},
 			"additionalProperties": false
 		},
-		"TrailingComma": {
+		"TrailingCommas": {
 			"description": "Print trailing commas wherever possible in multi-line comma-separated syntactic structures.",
 			"oneOf": [
 				{
@@ -3029,7 +3036,7 @@
 				}
 			]
 		},
-		"TrailingCommas": {
+		"TrailingCommas2": {
 			"oneOf": [
 				{
 					"description": "The formatter will remove the trailing commas",