Use stable sort

xoofx · Jun 20, 2022 · 4be6bb7 · 4be6bb7
1 parent ff0296f
commit 4be6bb7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/Tomlyn.Tests/ModelTests/TomlTableModelTests.cs b/src/Tomlyn.Tests/ModelTests/TomlTableModelTests.cs
@@ -302,6 +302,36 @@ public void TestPrimitiveOrder()
             }
         }
 
+        [Test]
+        public void TestOrdering()
+        {
+            var t = new Tomlyn.Model.TomlTable();
+            for (var i = 0; i < 17; ++i)
+            {
+                t.Add($"Test{i}", "Test");
+            }
+
+            Assert.AreEqual(
+@"Test0 = ""Test""
+Test1 = ""Test""
+Test2 = ""Test""
+Test3 = ""Test""
+Test4 = ""Test""
+Test5 = ""Test""
+Test6 = ""Test""
+Test7 = ""Test""
+Test8 = ""Test""
+Test9 = ""Test""
+Test10 = ""Test""
+Test11 = ""Test""
+Test12 = ""Test""
+Test13 = ""Test""
+Test14 = ""Test""
+Test15 = ""Test""
+Test16 = ""Test""
+", Toml.FromModel(t));
+        }
+
         private static void AssertJson(string input, string expectedJson)
         {
             var syntax = Toml.Parse(input);

diff --git a/src/Tomlyn/Model/ModelToTomlTransform.cs b/src/Tomlyn/Model/ModelToTomlTransform.cs
@@ -7,6 +7,7 @@
 using System.Globalization;
 using System.IO;
 using System.Text;
+using System.Linq;
 using Tomlyn.Helpers;
 using Tomlyn.Model.Accessors;
 using Tomlyn.Syntax;
@@ -199,7 +200,8 @@ private bool VisitObject(ObjectDynamicAccessor accessor, object currentObject, b
             }
 
             // Sort primitive first
-            properties.Sort((left, right) =>
+            properties = properties.OrderBy(_ => _,
+            Comparer<KeyValuePair<string,object>>.Create((left, right) =>
             {
                 var leftValue = left.Value;
                 var rightValue = right.Value;
@@ -219,7 +221,7 @@ private bool VisitObject(ObjectDynamicAccessor accessor, object currentObject, b
 
                 // Otherwise don't change the order if we don't have primitives
                 return 0;
-            });
+            })).ToList();
 
             // Probe inline for each key
             // If we require a key to be inlined, inline the rest