Don't escape / in pretty-printed strings

Fixes #900
amazon-ion · Jan 22, 2025 · 377fbf4 · 377fbf4
1 parent 53561b4
commit 377fbf4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/ion-tests b/ion-tests
diff --git a/src/text/text_formatter.rs b/src/text/text_formatter.rs
@@ -315,10 +315,8 @@ impl<W: fmt::Write> FmtValueFormatter<'_, W> {
                 '\r' => r"\r",
                 '\t' => r"\t",
                 '\\' => r"\\",
-                '/' => r"\/",
                 '"' => r#"\""#,
                 '\'' => r"\'",
-                '?' => r"\?",
                 '\x00' => r"\0", // NUL
                 '\x07' => r"\a", // alert BEL
                 '\x08' => r"\b", // backspace
@@ -577,6 +575,16 @@ mod formatter_test {
     #[test]
     fn test_format_string() -> IonResult<()> {
         formatter(|ivf| ivf.format_string("bar"), "\"bar\"");
+
+        // Test some string escapes
+        formatter(|ivf| ivf.format_string("/"), "\"/\""); // slash is not escaped
+        formatter(|ivf| ivf.format_string("\\"), "\"\\\\\""); // backslash is escaped
+        formatter(|ivf| ivf.format_string("'"), "\"\\'\""); // single quote is escaped
+        formatter(|ivf| ivf.format_string("\n"), "\"\\n\""); // newline is escaped
+        formatter(|ivf| ivf.format_string("\r"), "\"\\r\""); // carriage return is escaped
+        formatter(|ivf| ivf.format_string("\t"), "\"\\t\""); // tab is escaped
+        formatter(|ivf| ivf.format_string("\0"), "\"\\0\""); // NUL is escaped
+
         Ok(())
     }
+1 −0		conformance/README.md
+4 −4		conformance/system_macros/add_macros.ion
+17 −17		conformance/system_macros/add_symbols.ion
+6 −6		conformance/system_macros/default.ion
+23 −9		conformance/system_macros/flatten.ion
+9 −9		conformance/system_macros/make_decimal.ion
+4 −4		conformance/system_macros/make_field.ion
+20 −4		conformance/system_macros/make_list.ion
+20 −4		conformance/system_macros/make_sexp.ion
+6 −6		conformance/system_macros/make_string.ion
+13 −6		conformance/system_macros/make_struct.ion
+6 −6		conformance/system_macros/make_symbol.ion
+17 −17		conformance/system_macros/make_timestamp.ion
+4 −4		conformance/system_macros/repeat.ion
+6 −6		conformance/system_macros/set_macros.ion
+6 −6		conformance/system_macros/set_symbols.ion
+4 −4		conformance/system_macros/sum.ion
+4 −0		conformance/tdl/data_model_values.ion
+54 −0		conformance/tdl/expression_groups.ion
+19 −0		conformance/tdl/for.ion
+132 −0		conformance/tdl/if_multi.ion
+132 −0		conformance/tdl/if_none.ion
+132 −0		conformance/tdl/if_single.ion
+132 −0		conformance/tdl/if_some.ion
+17 −0		conformance/tdl/literal.ion
+13 −0		conformance/tdl/macro_invocation.ion
+17 −0		conformance/tdl/variable_expansion.ion