chore: revert type changes

biomejs · Mar 9, 2024 · c0d3ab2 · c0d3ab2
1 parent e374d98
commit c0d3ab2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/crates/biome_cli/src/commands/rage.rs b/crates/biome_cli/src/commands/rage.rs
@@ -263,7 +263,7 @@ impl Display for RageConfiguration<'_, '_> {
                             {KeyValuePair("Indent size", markup!({DebugDisplayOption(json_formatter_configuration.indent_size)}))}
                             {KeyValuePair("Line ending", markup!({DebugDisplayOption(json_formatter_configuration.line_ending)}))}
                             {KeyValuePair("Line width", markup!({DebugDisplayOption(json_formatter_configuration.line_width.map(|lw| lw.get()))}))}
-                            {KeyValuePair("Trailing Commas", markup!({DebugDisplay(json_formatter_configuration.trailing_commas)}))}
+                            {KeyValuePair("Trailing Commas", markup!({DebugDisplayOption(json_formatter_configuration.trailing_commas)}))}
                         ).fmt(fmt)?;
                     }
 

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
@@ -110,7 +110,7 @@ JSON Formatter:
   Indent size:                  unset
   Line ending:                  Lf
   Line width:                   100
-  Trailing Commas:              None
+  Trailing Commas:              unset
 
 Server:
   Version:                      0.0.0

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

diff --git a/crates/biome_service/src/settings.rs b/crates/biome_service/src/settings.rs
@@ -342,7 +342,7 @@ impl From<JsonConfiguration> for LanguageSettings<JsonLanguage> {
 
         language_setting.parser.allow_comments = json.parser.allow_comments;
         language_setting.parser.allow_trailing_commas = json.parser.allow_trailing_commas;
-        language_setting.formatter.trailing_commas = Some(json.formatter.trailing_commas);
+        language_setting.formatter.trailing_commas = json.formatter.trailing_commas;
         language_setting.formatter.enabled = Some(json.formatter.enabled);
         language_setting.formatter.line_width = json.formatter.line_width;
         language_setting.formatter.indent_width = json.formatter.indent_width.map(Into::into);