Update ML stringify to match JS, fix #6

Author: laktak

assets/mltabs_result.hjson

@@ -0,0 +1,8 @@
+{
+  foo:
+    '''
+    bar	joe
+    oki	doki
+    		two tabs
+    '''
+}

assets/mltabs_result.json

@@ -0,0 +1,3 @@
+{
+  "foo": "bar\tjoe\noki\tdoki\n\t\ttwo tabs"
+}

assets/mltabs_test.json

@@ -0,0 +1,3 @@
+{
+  "foo": "bar\tjoe\noki\tdoki\n\t\ttwo tabs"
+}

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

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",

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:

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

src/main/org/hjson/HjsonWriter.java

@@ -144,13 +144,16 @@ void writeString(String value, Writer tw, int level, String separator) throws IO
       // format or we must replace the offending characters with safe escape
       // sequences.
 
-      boolean test=false;
-      for(char ch : valuec) { if (needsEscape(ch)) { test=true; break; } }
-      if (!test) { tw.write(separator+"\""+value+"\""); return; }
-
-      test=false;
-      for(char ch : valuec) { if (needsEscapeML(ch)) { test=true; break; } }
-      if (!test && !value.contains("'''")) writeMLString(value, tw, level, separator);
+      boolean noEscape=true;
+      for(char ch : valuec) { if (needsEscape(ch)) { noEscape=false; break; } }
+      if (noEscape) { tw.write(separator+"\""+value+"\""); return; }
+
+      boolean noEscapeML=true, allWhite=true;
+      for(char ch : valuec) {
+        if (needsEscapeML(ch)) { noEscapeML=false; break; }
+        else if (!HjsonParser.isWhiteSpace(ch)) allWhite=false;
+      }
+      if (noEscapeML && !allWhite && !value.contains("'''")) writeMLString(value, tw, level, separator);
       else tw.write(separator+"\""+JsonWriter.escapeString(value)+"\"");
     }
     else tw.write(separator+value);
@@ -216,6 +219,7 @@ static boolean needsEscapeML(char c) {
     switch (c) {
       case '\n':
       case '\r':
+      case '\t':
         return false;
       default:
         return needsQuotes(c);

src/test/org/hjson/test/Main.java

@@ -85,6 +85,7 @@ public static void main(String[] args) throws Exception {
     boolean allOK=true;
 
     for (String file : testNames) {
+      if (file.contains("/")) continue; // skip for now
       int extIdx=file.lastIndexOf('.');
       String name=file.substring(0, extIdx);
       name=name.substring(0, name.length()-5);