refactor: streamline certain string operations (#1540)

NathanBaulch · web-flow · commit 5c9d96fe7a8f · 2025-07-07T17:36:41.000+08:00
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
@@ -695,7 +695,7 @@ private string FixFontFamilyName(string input)
                 }
 
                 var name = sb.ToString();
-                if (name.Contains('#', StringComparison.Ordinal))
+                if (name.Contains('#'))
                 {
                     if (!name.Equals("fonts:Inter#Inter", StringComparison.Ordinal) &&
                         !name.Equals("fonts:SourceGit#JetBrains Mono", StringComparison.Ordinal))
diff --git a/src/Commands/Blame.cs b/src/Commands/Blame.cs
@@ -50,7 +50,7 @@ public Blame(string repo, string file, string revision)
 
         private void ParseLine(string line)
         {
-            if (line.Contains('\0', StringComparison.Ordinal))
+            if (line.Contains('\0'))
             {
                 _result.IsBinary = true;
                 _result.LineInfos.Clear();
diff --git a/src/Commands/Config.cs b/src/Commands/Config.cs
@@ -31,13 +31,9 @@ public async Task<Dictionary<string, string>> ReadAllAsync()
                 var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
                 foreach (var line in lines)
                 {
-                    var idx = line.IndexOf('=', StringComparison.Ordinal);
-                    if (idx != -1)
-                    {
-                        var key = line.Substring(0, idx).Trim();
-                        var val = line.Substring(idx + 1).Trim();
-                        rs[key] = val;
-                    }
+                    var parts = line.Split('=', 2);
+                    if (parts.Length == 2)
+                        rs[parts[0]] = parts[1];
                 }
             }
 
diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -39,20 +40,10 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
         public async Task<Models.DiffResult> ReadAsync()
         {
             var rs = await ReadToEndAsync().ConfigureAwait(false);
-            var start = 0;
-            var end = rs.StdOut.IndexOf('\n', start);
-            while (end > 0)
-            {
-                var line = rs.StdOut.Substring(start, end - start);
+            var sr = new StringReader(rs.StdOut);
+            while (sr.ReadLine() is { } line)
                 ParseLine(line);
 
-                start = end + 1;
-                end = rs.StdOut.IndexOf('\n', start);
-            }
-
-            if (start < rs.StdOut.Length)
-                ParseLine(rs.StdOut.Substring(start));
-
             if (_result.IsBinary || _result.IsLFS || _result.TextDiff.Lines.Count == 0)
             {
                 _result.TextDiff = null;
diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
@@ -80,12 +80,12 @@ private Models.Branch ParseLine(string line)
             else if (refName.StartsWith(PREFIX_REMOTE, StringComparison.Ordinal))
             {
                 var name = refName.Substring(PREFIX_REMOTE.Length);
-                var shortNameIdx = name.IndexOf('/', StringComparison.Ordinal);
-                if (shortNameIdx < 0)
+                var nameParts = name.Split('/', 2);
+                if (nameParts.Length != 2)
                     return null;
 
-                branch.Remote = name.Substring(0, shortNameIdx);
-                branch.Name = name.Substring(branch.Remote.Length + 1);
+                branch.Remote = nameParts[0];
+                branch.Name = nameParts[1];
                 branch.IsLocal = false;
             }
             else
diff --git a/src/Commands/QueryRevisionObjects.cs b/src/Commands/QueryRevisionObjects.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections.Generic;
+using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -25,18 +26,9 @@ public QueryRevisionObjects(string repo, string sha, string parentFolder)
             var rs = await ReadToEndAsync().ConfigureAwait(false);
             if (rs.IsSuccess)
             {
-                var start = 0;
-                var end = rs.StdOut.IndexOf('\0', start);
-                while (end > 0)
-                {
-                    var line = rs.StdOut.Substring(start, end - start);
+                var sr = new StringReader(rs.StdOut);
+                while (sr.ReadLine() is { } line)
                     Parse(outs, line);
-                    start = end + 1;
-                    end = rs.StdOut.IndexOf('\0', start);
-                }
-
-                if (start < rs.StdOut.Length)
-                    Parse(outs, rs.StdOut.Substring(start));
             }
 
             return outs;
diff --git a/src/Commands/Statistics.cs b/src/Commands/Statistics.cs
@@ -1,4 +1,4 @@
-using System;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace SourceGit.Commands
@@ -19,31 +19,19 @@ public Statistics(string repo, int max)
             if (!rs.IsSuccess)
                 return statistics;
 
-            var start = 0;
-            var end = rs.StdOut.IndexOf('\n', start);
-            while (end > 0)
-            {
-                ParseLine(statistics, rs.StdOut.Substring(start, end - start));
-                start = end + 1;
-                end = rs.StdOut.IndexOf('\n', start);
-            }
-
-            if (start < rs.StdOut.Length)
-                ParseLine(statistics, rs.StdOut.Substring(start));
+            var sr = new StringReader(rs.StdOut);
+            while (sr.ReadLine() is { } line)
+                ParseLine(statistics, line);
 
             statistics.Complete();
             return statistics;
         }
 
         private void ParseLine(Models.Statistics statistics, string line)
         {
-            var dateEndIdx = line.IndexOf('$', StringComparison.Ordinal);
-            if (dateEndIdx == -1)
-                return;
-
-            var dateStr = line.AsSpan(0, dateEndIdx);
-            if (double.TryParse(dateStr, out var date))
-                statistics.AddCommit(line.Substring(dateEndIdx + 1), date);
+            var parts = line.Split('$', 2);
+            if (parts.Length == 2 && double.TryParse(parts[0], out var date))
+                statistics.AddCommit(parts[1], date);
         }
     }
 }
diff --git a/src/Models/Change.cs b/src/Models/Change.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace SourceGit.Models
+﻿namespace SourceGit.Models
 {
     public enum ChangeViewMode
     {
@@ -64,20 +62,13 @@ public void Set(ChangeState index, ChangeState workTree = ChangeState.None)
 
             if (index == ChangeState.Renamed || workTree == ChangeState.Renamed)
             {
-                var idx = Path.IndexOf('\t', StringComparison.Ordinal);
-                if (idx >= 0)
-                {
-                    OriginalPath = Path.Substring(0, idx);
-                    Path = Path.Substring(idx + 1);
-                }
-                else
+                var parts = Path.Split('\t', 2);
+                if (parts.Length < 2)
+                    parts = Path.Split(" -> ", 2);
+                if (parts.Length == 2)
                 {
-                    idx = Path.IndexOf(" -> ", StringComparison.Ordinal);
-                    if (idx > 0)
-                    {
-                        OriginalPath = Path.Substring(0, idx);
-                        Path = Path.Substring(idx + 4);
-                    }
+                    OriginalPath = parts[0];
+                    Path = parts[1];
                 }
             }
 
diff --git a/src/Models/OpenAI.cs b/src/Models/OpenAI.cs
@@ -32,25 +32,25 @@ public void Append(string text)
 
             buffer = REG_COT().Replace(buffer, "");
 
-            var startIdx = buffer.IndexOf('<', StringComparison.Ordinal);
+            var startIdx = buffer.IndexOf('<');
             if (startIdx >= 0)
             {
                 if (startIdx > 0)
                     OnReceive(buffer.Substring(0, startIdx));
 
-                var endIdx = buffer.IndexOf(">", startIdx + 1, StringComparison.Ordinal);
+                var endIdx = buffer.IndexOf('>', startIdx + 1);
                 if (endIdx <= startIdx)
                 {
                     if (buffer.Length - startIdx <= 15)
-                        _thinkTail.Append(buffer.Substring(startIdx));
+                        _thinkTail.Append(buffer.AsSpan(startIdx));
                     else
                         OnReceive(buffer.Substring(startIdx));
                 }
                 else if (endIdx < startIdx + 15)
                 {
                     var tag = buffer.Substring(startIdx + 1, endIdx - startIdx - 1);
                     if (_thinkTags.Contains(tag))
-                        _thinkTail.Append(buffer.Substring(startIdx));
+                        _thinkTail.Append(buffer.AsSpan(startIdx));
                     else
                         OnReceive(buffer.Substring(startIdx));
                 }
diff --git a/src/Models/Stash.cs b/src/Models/Stash.cs
@@ -15,8 +15,7 @@ public string Subject
         {
             get
             {
-                var idx = Message.IndexOf('\n', StringComparison.Ordinal);
-                return idx > 0 ? Message.Substring(0, idx).Trim() : Message;
+                return Message.Split('\n', 2)[0].Trim();
             }
         }
 
diff --git a/src/Models/Statistics.cs b/src/Models/Statistics.cs
@@ -199,7 +199,7 @@ public Statistics()
 
         public void AddCommit(string author, double timestamp)
         {
-            var emailIdx = author.IndexOf('±', StringComparison.Ordinal);
+            var emailIdx = author.IndexOf('±');
             var email = author.Substring(emailIdx + 1).ToLower(CultureInfo.CurrentCulture);
             if (!_users.TryGetValue(email, out var user))
             {
diff --git a/src/Models/User.cs b/src/Models/User.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Concurrent;
+﻿using System.Collections.Concurrent;
 
 namespace SourceGit.Models
 {
@@ -17,10 +16,12 @@ public User()
 
         public User(string data)
         {
-            var nameEndIdx = data.IndexOf('±', StringComparison.Ordinal);
+            var parts = data.Split('±', 2);
+            if (parts.Length < 2)
+                parts = [string.Empty, data];
 
-            Name = nameEndIdx > 0 ? data.Substring(0, nameEndIdx) : string.Empty;
-            Email = data.Substring(nameEndIdx + 1);
+            Name = parts[0];
+            Email = parts[1];
             _hash = data.GetHashCode();
         }
 
diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
@@ -151,7 +151,7 @@ private void MakeBranchNode(Models.Branch branch, List<BranchTreeNode> roots, Di
             {
                 var time = branch.CommitterDate;
                 var fullpath = $"{prefix}/{branch.Name}";
-                var sepIdx = branch.Name.IndexOf('/', StringComparison.Ordinal);
+                var sepIdx = branch.Name.IndexOf('/');
                 if (sepIdx == -1 || branch.IsDetachedHead)
                 {
                     roots.Add(new BranchTreeNode()
diff --git a/src/ViewModels/ChangeTreeNode.cs b/src/ViewModels/ChangeTreeNode.cs
@@ -55,7 +55,7 @@ public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<s
 
             foreach (var c in changes)
             {
-                var sepIdx = c.Path.IndexOf('/', StringComparison.Ordinal);
+                var sepIdx = c.Path.IndexOf('/');
                 if (sepIdx == -1)
                 {
                     nodes.Add(new ChangeTreeNode(c, 0));
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
@@ -232,7 +232,7 @@ public async Task OpenRevisionFileWithDefaultEditorAsync(string file)
             var fullPath = Native.OS.GetAbsPath(_repo.FullPath, file);
             var fileName = Path.GetFileNameWithoutExtension(fullPath) ?? "";
             var fileExt = Path.GetExtension(fullPath) ?? "";
-            var tmpFile = Path.Combine(Path.GetTempPath(), $"{fileName}~{_commit.SHA.Substring(0, 10)}{fileExt}");
+            var tmpFile = Path.Combine(Path.GetTempPath(), $"{fileName}~{_commit.SHA.AsSpan(0, 10)}{fileExt}");
 
             await Commands.SaveRevisionFile
                 .RunAsync(_repo.FullPath, _commit.SHA, file, tmpFile)
diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections.Generic;
+﻿using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -60,7 +61,7 @@ public async Task OpenWithDefaultEditorAsync()
             var fullPath = Native.OS.GetAbsPath(_repo.FullPath, _file);
             var fileName = Path.GetFileNameWithoutExtension(fullPath) ?? "";
             var fileExt = Path.GetExtension(fullPath) ?? "";
-            var tmpFile = Path.Combine(Path.GetTempPath(), $"{fileName}~{_revision.SHA.Substring(0, 10)}{fileExt}");
+            var tmpFile = Path.Combine(Path.GetTempPath(), $"{fileName}~{_revision.SHA.AsSpan(0, 10)}{fileExt}");
 
             await Commands.SaveRevisionFile
                 .RunAsync(_repo.FullPath, _revision.SHA, _file, tmpFile)
diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -52,11 +51,8 @@ public string FullMessage
                 if (SetProperty(ref _fullMessage, value))
                 {
                     var normalized = value.ReplaceLineEndings("\n");
-                    var idx = normalized.IndexOf("\n\n", StringComparison.Ordinal);
-                    if (idx > 0)
-                        Subject = normalized.Substring(0, idx).ReplaceLineEndings(" ");
-                    else
-                        Subject = value.ReplaceLineEndings(" ");
+                    var parts = normalized.Split("\n\n", 2);
+                    Subject = parts[0].ReplaceLineEndings(" ");
                 }
             }
         }
diff --git a/src/ViewModels/PushRevision.cs b/src/ViewModels/PushRevision.cs
@@ -1,4 +1,5 @@
-﻿using System.Threading.Tasks;
+﻿using System;
+using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
 {
@@ -31,7 +32,7 @@ public PushRevision(Repository repo, Models.Commit revision, Models.Branch remot
         public override async Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
-            ProgressDescription = $"Push {Revision.SHA.Substring(0, 10)} -> {RemoteBranch.FriendlyName} ...";
+            ProgressDescription = $"Push {Revision.SHA.AsSpan(0, 10)} -> {RemoteBranch.FriendlyName} ...";
 
             var log = _repo.CreateLog("Push Revision");
             Use(log);
diff --git a/src/ViewModels/SubmoduleCollection.cs b/src/ViewModels/SubmoduleCollection.cs
@@ -59,7 +59,7 @@ public static List<SubmoduleTreeNode> Build(IList<Models.Submodule> submodules,
 
             foreach (var module in submodules)
             {
-                var sepIdx = module.Path.IndexOf('/', StringComparison.Ordinal);
+                var sepIdx = module.Path.IndexOf('/');
                 if (sepIdx == -1)
                 {
                     nodes.Add(new SubmoduleTreeNode(module, 0));
diff --git a/src/ViewModels/TagCollection.cs b/src/ViewModels/TagCollection.cs
@@ -70,7 +70,7 @@ public static List<TagTreeNode> Build(List<Models.Tag> tags, HashSet<string> exp
 
             foreach (var tag in tags)
             {
-                var sepIdx = tag.Name.IndexOf('/', StringComparison.Ordinal);
+                var sepIdx = tag.Name.IndexOf('/');
                 if (sepIdx == -1)
                 {
                     nodes.Add(new TagTreeNode(tag, 0));
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -774,7 +774,7 @@ public ContextMenu CreateContextMenuForUnstagedChanges(string selectedSingleFold
                         }
                         else
                         {
-                            var isRooted = change.Path.IndexOf('/', StringComparison.Ordinal) <= 0;
+                            var isRooted = change.Path.IndexOf('/') <= 0;
                             var singleFile = new MenuItem();
                             singleFile.Header = App.Text("WorkingCopy.AddToGitIgnore.SingleFile");
                             singleFile.Click += (_, e) =>
@@ -1653,8 +1653,7 @@ public ContextMenu CreateContextMenuForCommitMessages()
                 for (int i = 0; i < historiesCount; i++)
                 {
                     var message = _repo.Settings.CommitMessages[i].Trim().ReplaceLineEndings("\n");
-                    var subjectEndIdx = message.IndexOf('\n');
-                    var subject = subjectEndIdx > 0 ? message.Substring(0, subjectEndIdx) : message;
+                    var subject = message.Split('\n', 2)[0];
                     var item = new MenuItem();
                     item.Header = new CommitMessageRecord(subject);
                     item.Icon = App.CreateMenuIcon("Icons.Histories");
diff --git a/src/Views/CommitMessageEditor.axaml.cs b/src/Views/CommitMessageEditor.axaml.cs
diff --git a/src/Views/CommitMessageTextBox.axaml.cs b/src/Views/CommitMessageTextBox.axaml.cs

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ private string FixFontFamilyName(string input)`
`695`	`695`	`}`
`696`	`696`
`697`	`697`	`var name = sb.ToString();`
`698`		`- if (name.Contains('#', StringComparison.Ordinal))`
	`698`	`+ if (name.Contains('#'))`
`699`	`699`	`{`
`700`	`700`	`if (!name.Equals("fonts:Inter#Inter", StringComparison.Ordinal) &&`
`701`	`701`	`!name.Equals("fonts:SourceGit#JetBrains Mono", StringComparison.Ordinal))`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public Blame(string repo, string file, string revision)`
`50`	`50`
`51`	`51`	`private void ParseLine(string line)`
`52`	`52`	`{`
`53`		`- if (line.Contains('\0', StringComparison.Ordinal))`
	`53`	`+ if (line.Contains('\0'))`
`54`	`54`	`{`
`55`	`55`	`_result.IsBinary = true;`
`56`	`56`	`_result.LineInfos.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,9 @@ public async Task<Dictionary<string, string>> ReadAllAsync()`
`31`	`31`	`var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);`
`32`	`32`	`foreach (var line in lines)`
`33`	`33`	`{`
`34`		`- var idx = line.IndexOf('=', StringComparison.Ordinal);`
`35`		`- if (idx != -1)`
`36`		`- {`
`37`		`- var key = line.Substring(0, idx).Trim();`
`38`		`- var val = line.Substring(idx + 1).Trim();`
`39`		`- rs[key] = val;`
`40`		`- }`
	`34`	`+ var parts = line.Split('=', 2);`
	`35`	`+ if (parts.Length == 2)`
	`36`	`+ rs[parts[0]] = parts[1];`
`41`	`37`	`}`
`42`	`38`	`}`
`43`	`39`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System;`
`2`		`-`
`3`		`-namespace SourceGit.Models`
	`1`	`+namespace SourceGit.Models`
`4`	`2`	`{`
`5`	`3`	`public enum ChangeViewMode`
`6`	`4`	`{`
`@@ -64,20 +62,13 @@ public void Set(ChangeState index, ChangeState workTree = ChangeState.None)`
`64`	`62`
`65`	`63`	`if (index == ChangeState.Renamed \|\| workTree == ChangeState.Renamed)`
`66`	`64`	`{`
`67`		`- var idx = Path.IndexOf('\t', StringComparison.Ordinal);`
`68`		`- if (idx >= 0)`
`69`		`- {`
`70`		`- OriginalPath = Path.Substring(0, idx);`
`71`		`- Path = Path.Substring(idx + 1);`
`72`		`- }`
`73`		`- else`
	`65`	`+ var parts = Path.Split('\t', 2);`
	`66`	`+ if (parts.Length < 2)`
	`67`	`+ parts = Path.Split(" -> ", 2);`
	`68`	`+ if (parts.Length == 2)`
`74`	`69`	`{`
`75`		`- idx = Path.IndexOf(" -> ", StringComparison.Ordinal);`
`76`		`- if (idx > 0)`
`77`		`- {`
`78`		`- OriginalPath = Path.Substring(0, idx);`
`79`		`- Path = Path.Substring(idx + 4);`
`80`		`- }`
	`70`	`+ OriginalPath = parts[0];`
	`71`	`+ Path = parts[1];`
`81`	`72`	`}`
`82`	`73`	`}`
`83`	`74`
Original file line number	Diff line number	Diff line change
`@@ -32,25 +32,25 @@ public void Append(string text)`
`32`	`32`
`33`	`33`	`buffer = REG_COT().Replace(buffer, "");`
`34`	`34`
`35`		`- var startIdx = buffer.IndexOf('<', StringComparison.Ordinal);`
	`35`	`+ var startIdx = buffer.IndexOf('<');`
`36`	`36`	`if (startIdx >= 0)`
`37`	`37`	`{`
`38`	`38`	`if (startIdx > 0)`
`39`	`39`	`OnReceive(buffer.Substring(0, startIdx));`
`40`	`40`
`41`		`- var endIdx = buffer.IndexOf(">", startIdx + 1, StringComparison.Ordinal);`
	`41`	`+ var endIdx = buffer.IndexOf('>', startIdx + 1);`
`42`	`42`	`if (endIdx <= startIdx)`
`43`	`43`	`{`
`44`	`44`	`if (buffer.Length - startIdx <= 15)`
`45`		`- _thinkTail.Append(buffer.Substring(startIdx));`
	`45`	`+ _thinkTail.Append(buffer.AsSpan(startIdx));`
`46`	`46`	`else`
`47`	`47`	`OnReceive(buffer.Substring(startIdx));`
`48`	`48`	`}`
`49`	`49`	`else if (endIdx < startIdx + 15)`
`50`	`50`	`{`
`51`	`51`	`var tag = buffer.Substring(startIdx + 1, endIdx - startIdx - 1);`
`52`	`52`	`if (_thinkTags.Contains(tag))`
`53`		`- _thinkTail.Append(buffer.Substring(startIdx));`
	`53`	`+ _thinkTail.Append(buffer.AsSpan(startIdx));`
`54`	`54`	`else`
`55`	`55`	`OnReceive(buffer.Substring(startIdx));`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ public string Subject`
`15`	`15`	`{`
`16`	`16`	`get`
`17`	`17`	`{`
`18`		`- var idx = Message.IndexOf('\n', StringComparison.Ordinal);`
`19`		`- return idx > 0 ? Message.Substring(0, idx).Trim() : Message;`
	`18`	`+ return Message.Split('\n', 2)[0].Trim();`
`20`	`19`	`}`
`21`	`20`	`}`
`22`	`21`