LuaTableTextWriter: Indension support.

Author: CXuesong

Luaon.NET/LuaTableTextWriter.cs

@@ -39,6 +39,7 @@ private enum Token
         private readonly List<LuaContainerContext> contextStack;
         private LuaContainerContext currentContext;
         private State currentState = State.Start;
+        private int _Indentation;
 
         // NextState[State][Token]
         private static readonly State[][] NextStateTable =
@@ -60,6 +61,8 @@ public LuaTableTextWriter(TextWriter writer)
             currentContext = new LuaContainerContext(LuaContainerType.None);
             contextStack = new List<LuaContainerContext>();
             CloseWriter = true;
+            Indentation = 2;
+            IndentChar = ' ';
         }
 
         /// <summary>
@@ -85,6 +88,26 @@ public Formatting Formatting
             }
         }
 
+        /// <summary>
+        /// Gets or sets how many <see cref="IndentChar"/>s to write for each level in the hierarchy
+        /// when <see cref="Formatting"/> is set to <see cref="Formatting.Prettified"/>.
+        /// </summary>
+        public int Indentation
+        {
+            get { return _Indentation; }
+            set
+            {
+                if (value < 0) throw new ArgumentOutOfRangeException(nameof(value));
+                _Indentation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/sets which character to use for indenting
+        /// when <see cref="Formatting"/> is set to <see cref="Formatting.Prettified"/>.
+        /// </summary>
+        public char IndentChar { get; set; }
+
         private void GotoNextState(Token token)
         {
             var next = NextStateTable[(int)currentState][(int)token];
@@ -157,8 +180,14 @@ public virtual void WriteEndTable()
         {
             AssertContainerType(LuaContainerType.Table);
             GotoNextState(Token.TableEnd);
-            Writer.Write('}');
             Pop();
+            if ((Formatting & Formatting.Prettified) == Formatting.Prettified)
+            {
+                Writer.WriteLine();
+                WriteIndentation();
+            }
+
+            Writer.Write('}');
         }
 
         /// <summary>
@@ -246,6 +275,12 @@ public virtual void WriteKey(object key)
             currentContext.KeyIsExpression = true;
         }
 
+        protected virtual void WriteIndentation()
+        {
+            var chars = Indentation * contextStack.Count;
+            for (int i = 0; i < chars; i++) Writer.Write(IndentChar);
+        }
+
         public virtual void WriteFieldDelimiter()
         {
             // Can be , or ;
@@ -256,8 +291,10 @@ private void DelimitLastValue(Token nextToken)
         {
             var s = currentState;
             GotoNextState(nextToken);
+
             if (s == State.FieldStart)
             {
+                // In the middle of a table.
                 if (currentContext.Key != null)
                 {
                     currentContext.Key = null;
@@ -266,8 +303,18 @@ private void DelimitLastValue(Token nextToken)
                 {
                     currentContext.CurrentIndex++;
                 }
+
                 WriteFieldDelimiter();
             }
+
+            if (nextToken != Token.TableEnd && (s == State.TableStart || s == State.FieldStart))
+            {
+                if ((Formatting & Formatting.Prettified) == Formatting.Prettified)
+                {
+                    Writer.WriteLine();
+                    WriteIndentation();
+                }
+            }
         }
 
         #region WriteLiteral overloads

XUnitTestProject1/Tests/LinqTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Luaon;
 using Luaon.Linq;
 using Xunit;
 using Xunit.Abstractions;
@@ -46,8 +47,8 @@ public void LTableTest()
             Assert.Equal(1, table["Child"][1]);
             Assert.Equal(2, table["Child"][2]);
             Assert.Equal(3, table["Child"][3]);
-            var s = table.ToString();
-            Output.WriteLine(s);
+            Assert.Equal("{[\"Test1\"]=1,2,[\"Test2\"]=3,4.5,[20]=5,[true]=\"6\",[\"Child\"]={1,2,3,4,5}}",
+                table.ToString(Formatting.None));
         }