Merge pull request #25 from bobroberts177/fix-rt-parser-string-output

Fix rt parser string output and trailing comma example and test

Author: disregard-previous-instructions

examples/json5-trailing-comma-formatter/README.md

@@ -29,12 +29,12 @@ output
 // My Document
 {
     breakfast: [
-        bacon,
-        eggs,
-        spam,  // <-- a trailing comma will be added here
+        'bacon',
+        'eggs',
+        'spam',  // <-- a trailing comma will be added here
     ],
     objekt: {
-        nested: value, // <-- and here
+        nested: "value", // <-- and here
     }, // <--- and here
 }
 

examples/json5-trailing-comma-formatter/src/main.rs

@@ -86,12 +86,12 @@ fn test() {
     let expected = String::from(r#"// My Document
 {
     breakfast: [
-        bacon,
-        eggs,
-        spam,  // <-- a trailing comma will be added here
+        'bacon',
+        'eggs',
+        'spam',  // <-- a trailing comma will be added here
     ],
     objekt: {
-        nested: value, // <-- and here
+        nested: "value", // <-- and here
     }, // <--- and here
 }"#);
     assert_eq!(res, expected)

src/rt/parser.rs

@@ -286,8 +286,12 @@ impl JSONValue {
             JSONValue::NaN => {String::from("Nan")}
             JSONValue::Hexadecimal(s) => {s.clone()}
             JSONValue::Bool(b) => b.to_string(),
-            JSONValue::DoubleQuotedString(s) => {s.clone()}
-            JSONValue::SingleQuotedString(s) => {s.clone()}
+            JSONValue::DoubleQuotedString(s) => {
+                format!("\"{s}\"")
+            }
+            JSONValue::SingleQuotedString(s) => {
+                format!("'{s}'")
+            }
             JSONValue::Unary { operator, value} => {
                 format!("{operator}{value}")
             }