Skip to content

Commit 825b74c

Browse files
committed
refactor: use String.AsSpan(int, int) instead of String.AsSpan().Slice(int, int)
Signed-off-by: leo <[email protected]>
1 parent 48bb8e9 commit 825b74c

File tree

12 files changed

+20
-20
lines changed

12 files changed

+20
-20
lines changed

src/Commands/Diff.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private void ParseLine(string line)
105105
}
106106
else if (line.StartsWith("-size ", StringComparison.Ordinal))
107107
{
108-
_result.LFSDiff.Old.Size = long.Parse(line.AsSpan().Slice(6));
108+
_result.LFSDiff.Old.Size = long.Parse(line.AsSpan(6));
109109
}
110110
}
111111
else if (ch == '+')
@@ -116,12 +116,12 @@ private void ParseLine(string line)
116116
}
117117
else if (line.StartsWith("+size ", StringComparison.Ordinal))
118118
{
119-
_result.LFSDiff.New.Size = long.Parse(line.AsSpan().Slice(6));
119+
_result.LFSDiff.New.Size = long.Parse(line.AsSpan(6));
120120
}
121121
}
122122
else if (line.StartsWith(" size ", StringComparison.Ordinal))
123123
{
124-
_result.LFSDiff.New.Size = _result.LFSDiff.Old.Size = long.Parse(line.AsSpan().Slice(6));
124+
_result.LFSDiff.New.Size = _result.LFSDiff.Old.Size = long.Parse(line.AsSpan(6));
125125
}
126126
return;
127127
}

src/Commands/Statistics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private void ParseLine(Models.Statistics statistics, string line)
4040
if (dateEndIdx == -1)
4141
return;
4242

43-
var dateStr = line.AsSpan().Slice(0, dateEndIdx);
43+
var dateStr = line.AsSpan(0, dateEndIdx);
4444
if (double.TryParse(dateStr, out var date))
4545
statistics.AddCommit(line.Substring(dateEndIdx + 1), date);
4646
}

src/Converters/PathConverters.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static class PathConverters
2222
var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
2323
var prefixLen = home.EndsWith('/') ? home.Length - 1 : home.Length;
2424
if (v.StartsWith(home, StringComparison.Ordinal))
25-
return $"~{v.AsSpan().Slice(prefixLen)}";
25+
return $"~{v.AsSpan(prefixLen)}";
2626

2727
return v;
2828
});

src/Models/AvatarManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ private void LoadDefaultAvatar(string key, string img)
196196
private string GetEmailHash(string email)
197197
{
198198
var lowered = email.ToLower(CultureInfo.CurrentCulture).Trim();
199-
var hash = MD5.HashData(Encoding.Default.GetBytes(lowered).AsSpan());
199+
var hash = MD5.HashData(Encoding.Default.GetBytes(lowered));
200200
var builder = new StringBuilder(hash.Length * 2);
201201
foreach (var c in hash)
202202
builder.Append(c.ToString("x2"));

src/Models/DiffResult.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ public TextDiffSelection MakeSelection(int startLine, int endLine, bool isCombin
148148
public void GenerateNewPatchFromSelection(Change change, string fileBlobGuid, TextDiffSelection selection, bool revert, string output)
149149
{
150150
var isTracked = !string.IsNullOrEmpty(fileBlobGuid);
151-
var fileGuid = isTracked ? fileBlobGuid.AsSpan().Slice(0, 8) : "00000000".AsSpan();
151+
var fileGuid = isTracked ? fileBlobGuid : "00000000";
152152

153-
var builder = new StringBuilder(512);
153+
var builder = new StringBuilder();
154154
builder.Append("diff --git a/").Append(change.Path).Append(" b/").Append(change.Path).Append('\n');
155155
if (!revert && !isTracked)
156156
builder.Append("new file mode 100644\n");

src/Models/Worktree.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public string Name
2323
get
2424
{
2525
if (IsDetached)
26-
return $"deteched HEAD at {Head.AsSpan().Slice(10)}";
26+
return $"deteched HEAD at {Head.AsSpan(10)}";
2727

2828
if (Branch.StartsWith("refs/heads/", StringComparison.Ordinal))
2929
return Branch.Substring(11);

src/ViewModels/Archive.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public Archive(Repository repo, Models.Commit commit)
3232
{
3333
_repo = repo;
3434
_revision = commit.SHA;
35-
_saveFile = $"archive-{commit.SHA.AsSpan().Slice(0, 10)}.zip";
35+
_saveFile = $"archive-{commit.SHA.AsSpan(0, 10)}.zip";
3636
BasedOn = commit;
3737
}
3838

src/ViewModels/Blame.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public Blame(string repo, string file, string revision)
3131
{
3232
_repo = repo;
3333

34-
Title = $"{file} @ {revision.AsSpan().Slice(0, 10)}";
34+
Title = $"{file} @ {revision.AsSpan(0, 10)}";
3535
Task.Run(() =>
3636
{
3737
var result = new Commands.Blame(repo, file, revision).Result();

src/ViewModels/Launcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ private void UpdateTitle()
584584
var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
585585
var prefixLen = home.EndsWith('/') ? home.Length - 1 : home.Length;
586586
if (path.StartsWith(home, StringComparison.Ordinal))
587-
path = $"~{path.AsSpan().Slice(prefixLen)}";
587+
path = $"~{path.AsSpan(prefixLen)}";
588588
}
589589

590590
Title = $"[{workspace}] {name} ({path})";

src/ViewModels/WorkingCopy.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ public ContextMenu CreateContextMenuForUnstagedChanges()
635635
}
636636
else if (_inProgressContext is RevertInProgress revert)
637637
{
638-
useTheirs.Header = App.Text("FileCM.ResolveUsing", $"{revert.Head.SHA.AsSpan().Slice(0, 10)} (revert)");
638+
useTheirs.Header = App.Text("FileCM.ResolveUsing", $"{revert.Head.SHA.AsSpan(0, 10)} (revert)");
639639
useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name);
640640
}
641641
else if (_inProgressContext is MergeInProgress merge)
@@ -993,7 +993,7 @@ public ContextMenu CreateContextMenuForUnstagedChanges()
993993
}
994994
else if (_inProgressContext is RevertInProgress revert)
995995
{
996-
useTheirs.Header = App.Text("FileCM.ResolveUsing", $"{revert.Head.SHA.AsSpan().Slice(0, 10)} (revert)");
996+
useTheirs.Header = App.Text("FileCM.ResolveUsing", $"{revert.Head.SHA.AsSpan(0, 10)} (revert)");
997997
useMine.Header = App.Text("FileCM.ResolveUsing", _repo.CurrentBranch.Name);
998998
}
999999
else if (_inProgressContext is MergeInProgress merge)
@@ -1417,7 +1417,7 @@ public ContextMenu CreateContextMenuForCommitMessages()
14171417
var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
14181418
var prefixLen = home.EndsWith('/') ? home.Length - 1 : home.Length;
14191419
if (gitTemplate.StartsWith(home, StringComparison.Ordinal))
1420-
friendlyName = $"~{gitTemplate.AsSpan().Slice(prefixLen)}";
1420+
friendlyName = $"~{gitTemplate.AsSpan(prefixLen)}";
14211421
}
14221422

14231423
var gitTemplateItem = new MenuItem();

0 commit comments

Comments
 (0)