Update ML stringify to match JS

laktak · laktak · commit 43ae24f47e92 · 2017-01-12T23:15:47.000+01:00
diff --git a/Hjson/HjsonWriter.cs b/Hjson/HjsonWriter.cs
@@ -186,7 +186,7 @@ void writeString(string value, TextWriter tw, int level, bool hasComment, string
         // sequences.
 
         if (!value.Any(c => needsEscape(c))) tw.Write(separator+"\""+value+"\"");
-        else if (!value.Any(c => needsEscapeML(c)) && !value.Contains("'''")) writeMLString(value, tw, level, separator);
+        else if (!value.Any(c => needsEscapeML(c)) && !value.Contains("'''") && !value.All(c => BaseReader.IsWhite(c))) writeMLString(value, tw, level, separator);
         else tw.Write(separator+"\""+JsonWriter.EscapeString(value)+"\"");
       }
       else tw.Write(separator+value);
@@ -263,6 +263,7 @@ static bool needsEscapeML(char c)
       {
         case '\n':
         case '\r':
+        case '\t':
           return false;
         default:
           return needsQuotes(c);
diff --git a/test/assets/mltabs_result.hjson b/test/assets/mltabs_result.hjson
@@ -0,0 +1,8 @@
+{
+  foo:
+    '''
+    bar	joe
+    oki	doki
+    		two tabs
+    '''
+}
diff --git a/test/assets/mltabs_result.json b/test/assets/mltabs_result.json
@@ -0,0 +1,3 @@
+{
+  "foo": "bar\tjoe\noki\tdoki\n\t\ttwo tabs"
+}
diff --git a/test/assets/mltabs_test.json b/test/assets/mltabs_test.json
@@ -0,0 +1,3 @@
+{
+  "foo": "bar\tjoe\noki\tdoki\n\t\ttwo tabs"
+}
diff --git a/test/assets/strings_result.hjson b/test/assets/strings_result.hjson
@@ -1,10 +1,14 @@
 {
   text1: This is a valid string value.
   text2: a \ is just a \
-  text3: "You need quotes\tfor escapes"
+  text3: '''You need quotes	for escapes'''
   text4a: " untrimmed "
   text4b: " untrimmed"
   text4c: "untrimmed "
+  notml1: "\n"
+  notml2: "  \n"
+  notml3: "\n  \n  \n  \n"
+  notml4: "\t\n"
   multiline1:
     '''
     first line
diff --git a/test/assets/strings_result.json b/test/assets/strings_result.json
@@ -5,6 +5,10 @@
   "text4a": " untrimmed ",
   "text4b": " untrimmed",
   "text4c": "untrimmed ",
+  "notml1": "\n",
+  "notml2": "  \n",
+  "notml3": "\n  \n  \n  \n",
+  "notml4": "\t\n",
   "multiline1": "first line\n  indented line\nlast line",
   "multiline2": "first line\n  indented line\nlast line",
   "multiline3": "first line\n  indented line\nlast line\n",
diff --git a/test/assets/strings_test.hjson b/test/assets/strings_test.hjson
@@ -10,6 +10,11 @@
   text4b: " untrimmed"
   text4c: "untrimmed "
 
+  notml1: "\n"
+  notml2: "  \n"
+  notml3: "\n  \n  \n  \n"
+  notml4: "\t\n"
+
   # multiline string
 
   multiline1:
diff --git a/test/assets/testlist.txt b/test/assets/testlist.txt
@@ -63,6 +63,7 @@ failStr6c_test.hjson
 failStr6d_test.hjson
 kan_test.hjson
 keys_test.hjson
+mltabs_test.json
 oa_test.hjson
 pass1_test.json
 pass2_test.json
@@ -72,4 +73,11 @@ passSingle_test.hjson
 root_test.hjson
 stringify1_test.hjson
 strings_test.hjson
-trail_test.hjson
+trail_test.hjson
+stringify/quotes_all_test.hjson
+stringify/quotes_always_test.hjson
+stringify/quotes_keys_test.hjson
+stringify/quotes_strings_ml_test.json
+stringify/quotes_strings_test.hjson
+extra/notabs_test.json
+extra/separator_test.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +{
 +  foo:
 +    '''
 +    bar	joe
 +    oki	doki
 +    		two tabs
 +    '''
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "foo": "bar\tjoe\noki\tdoki\n\t\ttwo tabs"`
	`3`	`+}`