fix(json_parser): fix broken JsonParserOptions::from(&JsonFileSource)…

… implementation
biomejs · Nov 14, 2024 · 271bfbd · 271bfbd
1 parent 95faf70
commit 271bfbd
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/crates/biome_json_parser/src/parser.rs b/crates/biome_json_parser/src/parser.rs
@@ -19,11 +19,13 @@ pub struct JsonParserOptions {
 }
 
 impl JsonParserOptions {
+    #[must_use]
     pub fn with_allow_comments(mut self) -> Self {
         self.allow_comments = true;
         self
     }
 
+    #[must_use]
     pub fn with_allow_trailing_commas(mut self) -> Self {
         self.allow_trailing_commas = true;
         self
@@ -32,12 +34,12 @@ impl JsonParserOptions {
 
 impl From<&JsonFileSource> for JsonParserOptions {
     fn from(file_source: &JsonFileSource) -> Self {
-        let options = Self::default();
+        let mut options = Self::default();
         if file_source.allow_comments() {
-            options.with_allow_comments();
+            options = options.with_allow_comments();
         }
         if file_source.allow_trailing_commas() {
-            options.with_allow_trailing_commas();
+            options = options.with_allow_trailing_commas();
         }
         options
     }
@@ -92,3 +94,24 @@ impl<'source> Parser for JsonParser<'source> {
         &mut self.source
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::JsonParserOptions;
+    use biome_json_syntax::JsonFileSource;
+
+    #[test]
+    fn parse_options_from_json_file_source_respects_allow_comments_and_allow_trailing_comma() {
+        let p1 = JsonParserOptions::from(&JsonFileSource::json());
+        assert!(!p1.allow_comments);
+        assert!(p1.allow_trailing_commas);
+
+        let p2 = JsonParserOptions::from(&JsonFileSource::json_allow_comments());
+        assert!(p2.allow_comments);
+        assert!(!p2.allow_trailing_commas);
+
+        let p3 = JsonParserOptions::from(&JsonFileSource::json_allow_comments_and_trailing_commas());
+        assert!(p3.allow_comments);
+        assert!(p3.allow_trailing_commas);
+    }
+}
diff --git a/crates/biome_json_syntax/src/file_source.rs b/crates/biome_json_syntax/src/file_source.rs
@@ -160,15 +160,18 @@ impl JsonFileSource {
         }
     }
 
+    #[must_use]
     pub fn with_allow_trailing_commas(mut self) -> Self {
         self.allow_trailing_commas = true;
         self
     }
 
+    #[must_use]
     pub fn allow_trailing_commas(&self) -> bool {
         self.allow_trailing_commas
     }
 
+    #[must_use]
     pub fn with_allow_comments(mut self) -> Self {
         self.allow_comments = true;
         self