refactor: now all filesystem related trees/lists are sorted in case-insensitive mode

love-linger · love-linger · commit 549409326175 · 2025-06-11T15:20:50.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs
@@ -39,7 +39,7 @@ public CompareRevisions(string repo, string start, string end, string path)
             foreach (var line in lines)
                 ParseLine(line);
 
-            _changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
+            _changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
             return _changes;
         }
 
diff --git a/src/Models/NumericSort.cs b/src/Models/NumericSort.cs
@@ -1,4 +1,7 @@
-﻿namespace SourceGit.Models
+﻿using System;
+using System.Globalization;
+
+namespace SourceGit.Models
 {
     public static class NumericSort
     {
@@ -23,7 +26,7 @@ public static int Compare(string s1, string s2)
                 bool isDigit1 = char.IsDigit(c1);
                 bool isDigit2 = char.IsDigit(c2);
                 if (isDigit1 != isDigit2)
-                    return c1.CompareTo(c2);
+                    return char.ToUpper(c1, CultureInfo.CurrentCulture).CompareTo(char.ToUpper(c2, CultureInfo.CurrentCulture));
 
                 do
                 {
@@ -55,7 +58,7 @@ public static int Compare(string s1, string s2)
                 if (isDigit1)
                     result = loc1 == loc2 ? string.CompareOrdinal(sub1, sub2) : loc1 - loc2;
                 else
-                    result = string.CompareOrdinal(sub1, sub2);
+                    result = string.Compare(sub1, sub2, StringComparison.OrdinalIgnoreCase);
 
                 if (result != 0)
                     return result;
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
@@ -449,7 +449,7 @@ public void SortNodes(List<RepositoryNode> collection)
                 if (l.IsRepository != r.IsRepository)
                     return l.IsRepository ? 1 : -1;
 
-                return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
+                return Models.NumericSort.Compare(l.Name, r.Name);
             });
         }
 
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -1275,6 +1275,7 @@ public void RefreshWorkingCopyChanges()
             if (_workingCopy == null)
                 return;
 
+            changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
             _workingCopy.SetData(changes);
 
             Dispatcher.UIThread.Invoke(() =>
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
@@ -71,7 +71,7 @@ public Models.Stash SelectedStash
                                     changes.Add(c);
 
                                 if (needSort)
-                                    changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
+                                    changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
                             }
 
                             Dispatcher.UIThread.Invoke(() =>
diff --git a/src/Views/RevisionFileTreeView.axaml.cs b/src/Views/RevisionFileTreeView.axaml.cs
@@ -270,12 +270,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 foreach (var obj in objects)
                     _tree.Add(new ViewModels.RevisionFileTreeNode { Backend = obj });
 
-                _tree.Sort((l, r) =>
-                {
-                    if (l.IsFolder == r.IsFolder)
-                        return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
-                    return l.IsFolder ? -1 : 1;
-                });
+                SortNodes(_tree);
 
                 var topTree = new List<ViewModels.RevisionFileTreeNode>();
                 MakeRows(topTree, _tree, 0);
@@ -341,13 +336,7 @@ private void OnRowsSelectionChanged(object sender, SelectionChangedEventArgs _)
             foreach (var obj in objects)
                 node.Children.Add(new ViewModels.RevisionFileTreeNode() { Backend = obj });
 
-            node.Children.Sort((l, r) =>
-            {
-                if (l.IsFolder == r.IsFolder)
-                    return Models.NumericSort.Compare(l.Name, r.Name);
-                return l.IsFolder ? -1 : 1;
-            });
-
+            SortNodes(node.Children);
             return node.Children;
         }
 
@@ -365,6 +354,16 @@ private void MakeRows(List<ViewModels.RevisionFileTreeNode> rows, List<ViewModel
             }
         }
 
+        private void SortNodes(List<ViewModels.RevisionFileTreeNode> nodes)
+        {
+            nodes.Sort((l, r) =>
+            {
+                if (l.IsFolder == r.IsFolder)
+                    return Models.NumericSort.Compare(l.Name, r.Name);
+                return l.IsFolder ? -1 : 1;
+            });
+        }
+
         private List<ViewModels.RevisionFileTreeNode> _tree = [];
         private AvaloniaList<ViewModels.RevisionFileTreeNode> _rows = [];
         private bool _disableSelectionChangingEvent = false;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public CompareRevisions(string repo, string start, string end, string path)`
`39`	`39`	`foreach (var line in lines)`
`40`	`40`	`ParseLine(line);`
`41`	`41`
`42`		`- _changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));`
	`42`	`+ _changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));`
`43`	`43`	`return _changes;`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ public void SortNodes(List<RepositoryNode> collection)`
`449`	`449`	`if (l.IsRepository != r.IsRepository)`
`450`	`450`	`return l.IsRepository ? 1 : -1;`
`451`	`451`
`452`		`- return string.Compare(l.Name, r.Name, StringComparison.Ordinal);`
	`452`	`+ return Models.NumericSort.Compare(l.Name, r.Name);`
`453`	`453`	`});`
`454`	`454`	`}`
`455`	`455`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public Models.Stash SelectedStash`
`71`	`71`	`changes.Add(c);`
`72`	`72`
`73`	`73`	`if (needSort)`
`74`		`- changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));`
	`74`	`+ changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`Dispatcher.UIThread.Invoke(() =>`