More scripture ref comparer to separate file; sort rows

Author: Enkidu93

src/SIL.Machine/Corpora/ScriptureRef.cs

@@ -130,38 +130,4 @@ public override string ToString()
             return sb.ToString();
         }
     }
-
-    public class ScriptureRefComparer : IComparer<ScriptureRef>, IEqualityComparer<ScriptureRef>
-    {
-        public static ScriptureRefComparer Default { get; } = new ScriptureRefComparer(compareSegments: true);
-        public static ScriptureRefComparer IgnoreSegments { get; } = new ScriptureRefComparer(compareSegments: false);
-        private readonly bool _compareSegments;
-
-        public ScriptureRefComparer(bool compareSegments = true)
-        {
-            _compareSegments = compareSegments;
-        }
-
-        public int Compare(ScriptureRef x, ScriptureRef y)
-        {
-            return x.CompareTo(y, _compareSegments);
-        }
-
-        public bool Equals(ScriptureRef x, ScriptureRef y)
-        {
-            return x.CompareTo(y, _compareSegments) == 0;
-        }
-
-        public int GetHashCode(ScriptureRef obj)
-        {
-            int hashCode = 23;
-            hashCode =
-                hashCode * 31
-                + (_compareSegments ? obj.VerseRef.BBBCCCVVVS.GetHashCode() : obj.VerseRef.BBBCCCVVV.GetHashCode());
-            hashCode = hashCode * 31 + obj.Versification.GetHashCode();
-            // Using ToRelaxed is necessary to maintain equality across relaxed refs, Equals properly handles relaxed ref comparison
-            hashCode = hashCode * 31 + obj.ToRelaxed().Path.GetSequenceHashCode();
-            return hashCode;
-        }
-    }
 }

src/SIL.Machine/Corpora/ScriptureRefComparer.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using SIL.Extensions;
+using SIL.Machine.Corpora;
+
+public class ScriptureRefComparer : IComparer<ScriptureRef>, IEqualityComparer<ScriptureRef>
+{
+    public static ScriptureRefComparer Default { get; } = new ScriptureRefComparer(compareSegments: true);
+    public static ScriptureRefComparer IgnoreSegments { get; } = new ScriptureRefComparer(compareSegments: false);
+    private readonly bool _compareSegments;
+
+    public ScriptureRefComparer(bool compareSegments = true)
+    {
+        _compareSegments = compareSegments;
+    }
+
+    public int Compare(ScriptureRef x, ScriptureRef y)
+    {
+        return x.CompareTo(y, _compareSegments);
+    }
+
+    public bool Equals(ScriptureRef x, ScriptureRef y)
+    {
+        return x.CompareTo(y, _compareSegments) == 0;
+    }
+
+    public int GetHashCode(ScriptureRef obj)
+    {
+        int hashCode = 23;
+        hashCode =
+            hashCode * 31
+            + (_compareSegments ? obj.VerseRef.BBBCCCVVVS.GetHashCode() : obj.VerseRef.BBBCCCVVV.GetHashCode());
+        hashCode = hashCode * 31 + obj.Versification.GetHashCode();
+        // Using ToRelaxed is necessary to maintain equality across relaxed refs, Equals properly handles relaxed ref comparison
+        hashCode = hashCode * 31 + obj.ToRelaxed().Path.GetSequenceHashCode();
+        return hashCode;
+    }
+}

src/SIL.Machine/Corpora/UpdateUsfmParserHandler.cs

@@ -81,13 +81,20 @@ public UpdateUsfmParserHandler(
         )
         {
             _rows = rows ?? Array.Empty<UpdateUsfmRow>();
+            _rows = _rows
+                .Where(r => r.Refs.Count > 0)
+                .OrderBy(
+                    r => r.Refs[0],
+                    compareSegments ? ScriptureRefComparer.Default : ScriptureRefComparer.IgnoreSegments
+                )
+                .ToArray();
             _verseRows = new List<int>();
             _verseRowsMap = new Dictionary<VerseRef, List<RowInfo>>(
                 compareSegments ? VerseRefComparer.Default : VerseRefComparer.IgnoreSegments
             );
             _updateRowsVersification = ScrVers.English;
             if (_rows.Count > 0)
-                _updateRowsVersification = _rows.First(r => r.Refs.Count > 0).Refs[0].Versification;
+                _updateRowsVersification = _rows[0].Refs[0].Versification;
             _tokens = new List<UsfmToken>();
             _updatedText = new List<UsfmToken>();
             _updateBlocks = new Stack<UsfmUpdateBlock>();