Skip to content

Commit 33b67cf

Browse files
committed
LuaTableTextWriter: Fixed indent issue.
1 parent 99e0160 commit 33b67cf

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

Luaon.Json/JsonLuaWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public override void WritePropertyName(string name)
163163
protected override void WriteIndent()
164164
{
165165
var indentCount = nestedLevel * Indentation;
166-
if (currentIdentation == null || currentIdentation.Length - currentIdentationNewLine.Length < indentCount)
166+
if (currentIdentation == null || currentIdentation.Length < currentIdentationNewLine.Length + indentCount)
167167
{
168168
var newLine = writer.NewLine;
169169
var chars = new char[newLine.Length + indentCount];

Luaon.NET/LuaTableTextWriter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,8 @@ protected virtual void WriteIndent()
338338
{
339339
var newLine = Writer.NewLine;
340340
var chars = new char[newLine.Length + indentCount];
341-
newLine.CopyTo(0, chars, 0, chars.Length);
342-
for (int i = newLine.Length; i < newLine.Length; i++) chars[i] = _IndentChar;
341+
newLine.CopyTo(0, chars, 0, newLine.Length);
342+
for (int i = newLine.Length; i < chars.Length; i++) chars[i] = _IndentChar;
343343
currentIdentation = chars;
344344
currentIdentationNewLine = newLine;
345345
}

Luaon.NET/Luaon.NET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
55
<RootNamespace>Luaon</RootNamespace>
66
<PackageId>CXuesong.Luaon</PackageId>
7-
<Version>0.1.0</Version>
7+
<Version>0.1.1</Version>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<Copyright>Copyright (C) CXuesong 2018</Copyright>
1010
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

XUnitTestProject1/Tests/LinqTests.cs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,22 @@ public void LTableTest()
4949
Assert.Equal(3, table["Child"][3]);
5050
Assert.Equal("{Test1=1,2,Test2=3,4.5,[20]=5,[true]=\"6\",Child={1,2,3,4,5}}",
5151
table.ToString(Formatting.None));
52+
Assert.Equal(@"{
53+
Test1 = 1,
54+
2,
55+
Test2 = 3,
56+
4.5,
57+
[20] = 5,
58+
[true] = ""6"",
59+
Child = {
60+
1,
61+
2,
62+
3,
63+
4,
64+
5
65+
}
66+
}", table.ToString());
5267
}
5368

54-
5569
}
5670
}

0 commit comments

Comments
 (0)