code_style: remove warnings reported by JetBrains Rider

Signed-off-by: leo <[email protected]>

Author: love-linger

src/App.axaml.cs

@@ -608,10 +608,10 @@ private void Check4Update(bool manually = false)
                 try
                 {
                     // Fetch latest release information.
-                    using var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(5) };
-                    var data = await client.GetStringAsync("https://sourcegit-scm.github.io/data/version.json");
+                    using var client = new HttpClient();
+                    client.Timeout = TimeSpan.FromSeconds(5);
 
-                    // Parse JSON into Models.Version.
+                    var data = await client.GetStringAsync("https://sourcegit-scm.github.io/data/version.json");
                     var ver = JsonSerializer.Deserialize(data, JsonCodeGen.Default.Version);
                     if (ver == null)
                         return;

src/Commands/Command.cs

@@ -48,22 +48,21 @@ public async Task<bool> ExecAsync()
             proc.OutputDataReceived += (_, e) => HandleOutput(e.Data, errs);
             proc.ErrorDataReceived += (_, e) => HandleOutput(e.Data, errs);
 
-            Process dummy = null;
-            var dummyProcLock = new object();
+            var captured = new CapturedProcess() { Process = proc };
+            var capturedLock = new object();
             try
             {
                 proc.Start();
 
                 // Not safe, please only use `CancellationToken` in readonly commands.
                 if (CancellationToken.CanBeCanceled)
                 {
-                    dummy = proc;
                     CancellationToken.Register(() =>
                     {
-                        lock (dummyProcLock)
+                        lock (capturedLock)
                         {
-                            if (dummy is { HasExited: false })
-                                dummy.Kill();
+                            if (captured is { Process: { HasExited: false } })
+                                captured.Process.Kill();
                         }
                     });
                 }
@@ -89,12 +88,9 @@ public async Task<bool> ExecAsync()
                 HandleOutput(e.Message, errs);
             }
 
-            if (dummy != null)
+            lock (capturedLock)
             {
-                lock (dummyProcLock)
-                {
-                    dummy = null;
-                }
+                captured.Process = null;
             }
 
             Log?.AppendLine(string.Empty);
@@ -116,7 +112,8 @@ public async Task<bool> ExecAsync()
 
         protected Result ReadToEnd()
         {
-            using var proc = new Process() { StartInfo = CreateGitStartInfo(true) };
+            using var proc = new Process();
+            proc.StartInfo = CreateGitStartInfo(true);
 
             try
             {
@@ -138,7 +135,8 @@ protected Result ReadToEnd()
 
         protected async Task<Result> ReadToEndAsync()
         {
-            using var proc = new Process() { StartInfo = CreateGitStartInfo(true) };
+            using var proc = new Process();
+            proc.StartInfo = CreateGitStartInfo(true);
 
             try
             {
@@ -245,6 +243,11 @@ private void HandleOutput(string line, List<string> errs)
             errs.Add(line);
         }
 
+        private class CapturedProcess
+        {
+            public Process Process { get; set; } = null;
+        }
+
         [GeneratedRegex(@"\d+%")]
         private static partial Regex REG_PROGRESS();
     }

src/Commands/Commit.cs

@@ -34,7 +34,7 @@ public async Task<bool> RunAsync()
             }
         }
 
-        private readonly string _tmpFile = string.Empty;
-        private readonly string _message = string.Empty;
+        private readonly string _tmpFile;
+        private readonly string _message;
     }
 }

src/Commands/QueryBranches.cs

@@ -94,8 +94,7 @@ private Models.Branch ParseLine(string line)
                 branch.IsLocal = true;
             }
 
-            ulong committerDate = 0;
-            ulong.TryParse(parts[1], out committerDate);
+            ulong.TryParse(parts[1], out var committerDate);
 
             branch.FullName = refName;
             branch.CommitterDate = committerDate;

src/Commands/QueryFileContent.cs

@@ -21,7 +21,7 @@ public static async Task<Stream> RunAsync(string repo, string revision, string f
             var stream = new MemoryStream();
             try
             {
-                using var proc = Process.Start(starter);
+                using var proc = Process.Start(starter)!;
                 await proc.StandardOutput.BaseStream.CopyToAsync(stream).ConfigureAwait(false);
                 await proc.WaitForExitAsync().ConfigureAwait(false);
             }
@@ -49,7 +49,7 @@ public static async Task<Stream> FromLFSAsync(string repo, string oid, long size
             var stream = new MemoryStream();
             try
             {
-                using var proc = Process.Start(starter);
+                using var proc = Process.Start(starter)!;
                 await proc.StandardInput.WriteLineAsync("version https://git-lfs.github.com/spec/v1").ConfigureAwait(false);
                 await proc.StandardInput.WriteLineAsync($"oid sha256:{oid}").ConfigureAwait(false);
                 await proc.StandardInput.WriteLineAsync($"size {size}").ConfigureAwait(false);

src/Commands/QueryGitDir.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using System.Threading.Tasks;
 
 namespace SourceGit.Commands
 {
@@ -16,12 +15,6 @@ public string GetResult()
             return Parse(ReadToEnd());
         }
 
-        public async Task<string> GetResultAsync()
-        {
-            var rs = await ReadToEndAsync().ConfigureAwait(false);
-            return Parse(rs);
-        }
-
         private string Parse(Result rs)
         {
             if (!rs.IsSuccess)

src/Commands/QueryTags.cs

@@ -34,16 +34,15 @@ public QueryTags(string repo)
                 if (!string.IsNullOrEmpty(message) && message.Equals(name, StringComparison.Ordinal))
                     message = null;
 
-                ulong creactorDate = 0;
-                ulong.TryParse(subs[5], out creactorDate);
+                ulong.TryParse(subs[5], out var creatorDate);
 
                 tags.Add(new Models.Tag()
                 {
                     Name = name,
                     IsAnnotated = subs[1].Equals("tag", StringComparison.Ordinal),
                     SHA = string.IsNullOrEmpty(subs[3]) ? subs[2] : subs[3],
                     Creator = Models.User.FindOrAdd(subs[4]),
-                    CreatorDate = creactorDate,
+                    CreatorDate = creatorDate,
                     Message = message,
                 });
             }

src/Commands/SaveChangesAsPatch.cs

@@ -62,7 +62,7 @@ private static async Task<bool> ProcessSingleChangeAsync(string repo, Models.Dif
 
             try
             {
-                using var proc = Process.Start(starter);
+                using var proc = Process.Start(starter)!;
                 await proc.StandardOutput.BaseStream.CopyToAsync(writer).ConfigureAwait(false);
                 await proc.WaitForExitAsync().ConfigureAwait(false);
                 return proc.ExitCode == 0;

src/Commands/SaveRevisionFile.cs

@@ -9,7 +9,7 @@ public static class SaveRevisionFile
     {
         public static async Task RunAsync(string repo, string revision, string file, string saveTo)
         {
-            var dir = Path.GetDirectoryName(saveTo);
+            var dir = Path.GetDirectoryName(saveTo) ?? string.Empty;
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
@@ -42,7 +42,7 @@ private static async Task ExecCmdAsync(string repo, string args, string outputFi
             {
                 try
                 {
-                    using var proc = Process.Start(starter);
+                    using var proc = Process.Start(starter)!;
 
                     if (input != null)
                     {

src/Commands/UnstageChangesForAmend.cs

@@ -63,7 +63,7 @@ public async Task<bool> ExecAsync()
 
             try
             {
-                using var proc = Process.Start(starter);
+                using var proc = Process.Start(starter)!;
                 await proc.StandardInput.WriteAsync(_patchBuilder.ToString());
                 proc.StandardInput.Close();
 
@@ -83,7 +83,7 @@ public async Task<bool> ExecAsync()
             }
         }
 
-        private string _repo = "";
-        private StringBuilder _patchBuilder = new StringBuilder();
+        private readonly string _repo;
+        private readonly StringBuilder _patchBuilder = new();
     }
 }