Merge pull request #17 from mcraiha/spacing-fixes

 Fix spacing related issues

Author: jordanbtucker

Json5/Json5.cs

@@ -45,7 +45,7 @@ public static string Stringify(Json5Value value, Func<Json5Container, string, Js
 
         public static string Stringify(Json5Value value, Func<Json5Container, string, Json5Value, Json5Value> replacer, int space)
         {
-            return Stringify(value, replacer, new string(' ', Math.Max(space, 10)));
+            return Stringify(value, replacer, new string(' ', Math.Min(space, 10)));
         }
 
         public static string Stringify(Json5Value value, Func<string, Json5Value, Json5Value> replacer, string space = null)

Json5/Json5Array.cs

@@ -111,12 +111,15 @@ public override Json5Type Type
             get { return Json5Type.Array; }
         }
 
-        internal override string ToJson5String(string space, string indent)
+        internal override string ToJson5String(string space, string indent, bool useOneSpaceIndent = false)
         {
+            // "If white space is used, trailing commas will be used in objects and arrays." from specification
+            bool forcedCommaAndNewLineRequired = !string.IsNullOrEmpty(space);
+
             string newLine = string.IsNullOrEmpty(space) ? "" : "\n";
 
             // TODO: Use string builder instead of string
-            string s = "[" + newLine;
+            string s = indent + "[" + newLine;
 
             bool isFirstValue = true;
 
@@ -134,6 +137,11 @@ internal override string ToJson5String(string space, string indent)
                 s += (value ?? Null).ToJson5String(space, indent + space);
             }
 
+            if (forcedCommaAndNewLineRequired)
+            {
+                s += "," + newLine;
+            }
+
             s += indent + "]";
 
             return s;

Json5/Json5Boolean.cs

@@ -19,9 +19,9 @@ protected override object Value
             get { return this.value; }
         }
 
-        internal override string ToJson5String(string space, string indent)
+        internal override string ToJson5String(string space, string indent, bool useOneSpaceIndent = false)
         {
-            return this.value.ToString().ToLower();
+            return AddIndent(this.value.ToString().ToLower(), indent, useOneSpaceIndent);
         }
 
         public static implicit operator bool(Json5Boolean value)

Json5/Json5Date.cs

@@ -21,9 +21,9 @@ protected override object Value
             get { return this.value; }
         }
 
-        internal override string ToJson5String(string space, string indent)
+        internal override string ToJson5String(string space, string indent, bool useOneSpaceIndent = false)
         {
-            return Json5.QuoteString(this.value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fff'Z'"));
+            return AddIndent(Json5.QuoteString(this.value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fff'Z'")), indent, useOneSpaceIndent);
         }
 
         public static implicit operator DateTimeOffset(Json5Date value)

Json5/Json5Null.cs

@@ -9,9 +9,9 @@ public override Json5Type Type
             get { return Json5Type.Null; }
         }
 
-        internal override string ToJson5String(string space, string indent)
+        internal override string ToJson5String(string space, string indent, bool useOneSpaceIndent = false)
         {
-            return "null";
+            return AddIndent("null", indent, useOneSpaceIndent);
         }
     }
 }

Json5/Json5Number.cs

@@ -21,9 +21,9 @@ protected override object Value
             get { return this.value; }
         }
 
-        internal override string ToJson5String(string space, string indent)
+        internal override string ToJson5String(string space, string indent, bool useOneSpaceIndent = false)
         {
-            return this.value.ToString(CultureInfo.InvariantCulture);
+            return AddIndent(this.value.ToString(CultureInfo.InvariantCulture), indent, useOneSpaceIndent);
         }
 
         public static implicit operator double(Json5Number value)

Json5/Json5Object.cs

@@ -65,12 +65,17 @@ public override Json5Type Type
             get { return Json5Type.Object; }
         }
 
-        internal override string ToJson5String(string space, string indent)
+        internal override string ToJson5String(string space, string indent, bool useOneSpaceIndent = false)
         {
+            // "If white space is used, trailing commas will be used in objects and arrays." from specification
+            bool forcedCommaAndNewLineRequired = !string.IsNullOrEmpty(space);
+
             string newLine = string.IsNullOrEmpty(space) ? "" : "\n";
 
+            string currentIndent = useOneSpaceIndent ? " " : indent;
+
             // TODO: Use string builder instead of string
-            string s = "{" + newLine;
+            string s = currentIndent + "{" + newLine;
 
             bool isFirstValue = true;
 
@@ -86,7 +91,13 @@ internal override string ToJson5String(string space, string indent)
                 }
 
                 s += indent + space + KeyToString(property.Key) + ":";
-                s += (property.Value ?? Null).ToJson5String(space, indent + space);
+
+                s += (property.Value ?? Null).ToJson5String(space, indent + space, forcedCommaAndNewLineRequired);
+            }
+
+            if (forcedCommaAndNewLineRequired)
+            {
+                s += "," + newLine;
             }
 
             s += indent + "}";

Json5/Json5String.cs

@@ -23,9 +23,9 @@ protected override object Value
             get { return this.value; }
         }
 
-        internal override string ToJson5String(string space, string indent)
+        internal override string ToJson5String(string space, string indent, bool useOneSpaceIndent = false)
         {
-            return Json5.QuoteString(this.value);
+            return AddIndent(Json5.QuoteString(this.value), indent, useOneSpaceIndent);
         }
 
         public static implicit operator string(Json5String value)

Json5/Json5Value.cs

@@ -33,7 +33,29 @@ public string ToJson5String(string space = null)
             return this.ToJson5String(space, "");
         }
 
-        internal abstract string ToJson5String(string space, string indent);
+        internal abstract string ToJson5String(string space, string indent, bool useOneSpaceIndent = false);
+
+        /// <summary>
+        /// Add indent string to the start of original string, if needed
+        /// </summary>
+        /// <example>if original string is "worm" and indent is "  " then this returns "  worm"</example>
+        /// <param name="originalString">Original string</param>
+        /// <param name="indent">Indent string, can contain other chars than whitespace</param>
+        /// <param name="useOneSpaceIndent">Use one space indent, this is for case where object value starts</param>
+        /// <returns>Original or combined string</returns>
+        internal static string AddIndent(string originalString, string indent, bool useOneSpaceIndent)
+        {
+            if (useOneSpaceIndent)
+            {
+                return " " + originalString;
+            }
+            else if (string.IsNullOrEmpty(indent))
+            {
+                return originalString;
+            }
+
+            return indent + originalString;
+        }
 
         public static implicit operator Json5Value(string value)
         {