code_style: general cleanup

.editorconfig

@@ -292,6 +292,7 @@ indent_size = 2
 # Shell scripts
 [*.sh]
 end_of_line = lf
+
 [*.{cmd,bat}]
 end_of_line = crlf
 

.github/workflows/build.yml

@@ -6,23 +6,23 @@ jobs:
     strategy:
       matrix:
         include:
-          - name : Windows x64
+          - name: Windows x64
             os: windows-2022
             runtime: win-x64
-          - name : Windows ARM64
+          - name: Windows ARM64
             os: windows-2022
             runtime: win-arm64
-          - name : macOS (Intel)
+          - name: macOS (Intel)
             os: macos-13
             runtime: osx-x64
-          - name : macOS (Apple Silicon)
+          - name: macOS (Apple Silicon)
             os: macos-latest
             runtime: osx-arm64
-          - name : Linux
+          - name: Linux
             os: ubuntu-latest
             runtime: linux-x64
             container: ubuntu:20.04
-          - name : Linux (arm64)
+          - name: Linux (arm64)
             os: ubuntu-latest
             runtime: linux-arm64
             container: ubuntu:20.04

.github/workflows/format-check.yml

@@ -1,7 +1,9 @@
 name: Format Check
 on:
   push:
-    branches: [ develop ]
+    branches: [develop]
+  pull_request:
+    branches: [develop]
   workflow_dispatch:
   workflow_call:
 

.github/workflows/localization-check.yml

@@ -1,7 +1,7 @@
 name: Localization Check
 on:
   push:
-    branches: [ develop ]
+    branches: [develop]
     paths:
       - 'src/Resources/Locales/**'
   workflow_dispatch:

.github/workflows/package.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-2022
     strategy:
       matrix:
-        runtime: [ win-x64, win-arm64 ]
+        runtime: [win-x64, win-arm64]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

src/App.axaml.cs

@@ -221,7 +221,8 @@ public static void SetTheme(string theme, string themeOverridesFile)
                 try
                 {
                     var resDic = new ResourceDictionary();
-                    var overrides = JsonSerializer.Deserialize(File.ReadAllText(themeOverridesFile), JsonCodeGen.Default.ThemeOverrides);
+                    using var stream = File.OpenRead(themeOverridesFile);
+                    var overrides = JsonSerializer.Deserialize(stream, JsonCodeGen.Default.ThemeOverrides);
                     foreach (var kv in overrides.BasicColors)
                     {
                         if (kv.Key.Equals("SystemAccentColor", StringComparison.Ordinal))
@@ -449,31 +450,21 @@ private static bool TryLaunchAsRebaseTodoEditor(string[] args, out int exitCode)
             if (!File.Exists(jobsFile))
                 return true;
 
-            var collection = JsonSerializer.Deserialize(File.ReadAllText(jobsFile), JsonCodeGen.Default.InteractiveRebaseJobCollection);
+            using var stream = File.OpenRead(jobsFile);
+            var collection = JsonSerializer.Deserialize(stream, JsonCodeGen.Default.InteractiveRebaseJobCollection);
             using var writer = new StreamWriter(file);
             foreach (var job in collection.Jobs)
             {
-                switch (job.Action)
+                var code = job.Action switch
                 {
-                    case Models.InteractiveRebaseAction.Pick:
-                        writer.WriteLine($"p {job.SHA}");
-                        break;
-                    case Models.InteractiveRebaseAction.Edit:
-                        writer.WriteLine($"e {job.SHA}");
-                        break;
-                    case Models.InteractiveRebaseAction.Reword:
-                        writer.WriteLine($"r {job.SHA}");
-                        break;
-                    case Models.InteractiveRebaseAction.Squash:
-                        writer.WriteLine($"s {job.SHA}");
-                        break;
-                    case Models.InteractiveRebaseAction.Fixup:
-                        writer.WriteLine($"f {job.SHA}");
-                        break;
-                    default:
-                        writer.WriteLine($"d {job.SHA}");
-                        break;
-                }
+                    Models.InteractiveRebaseAction.Pick => 'p',
+                    Models.InteractiveRebaseAction.Edit => 'e',
+                    Models.InteractiveRebaseAction.Reword => 'r',
+                    Models.InteractiveRebaseAction.Squash => 's',
+                    Models.InteractiveRebaseAction.Fixup => 'f',
+                    _ => 'p'
+                };
+                writer.WriteLine($"{code} {job.SHA}");
             }
 
             writer.Flush();
@@ -506,7 +497,8 @@ private static bool TryLaunchAsRebaseMessageEditor(string[] args, out int exitCo
 
             var origHead = File.ReadAllText(origHeadFile).Trim();
             var onto = File.ReadAllText(ontoFile).Trim();
-            var collection = JsonSerializer.Deserialize(File.ReadAllText(jobsFile), JsonCodeGen.Default.InteractiveRebaseJobCollection);
+            using var stream = File.OpenRead(jobsFile);
+            var collection = JsonSerializer.Deserialize(stream, JsonCodeGen.Default.InteractiveRebaseJobCollection);
             if (!collection.Onto.Equals(onto) || !collection.OrigHead.Equals(origHead))
                 return true;
 
@@ -626,7 +618,8 @@ private void Check4Update(bool manually = false)
                 try
                 {
                     // Fetch latest release information.
-                    var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(5) };
+                    using var client = new HttpClient();
+                    client.Timeout = TimeSpan.FromSeconds(5);
                     var data = await client.GetStringAsync("https://sourcegit-scm.github.io/data/version.json");
 
                     // Parse JSON into Models.Version.

src/Commands/Command.cs

@@ -54,9 +54,9 @@ public async Task<bool> ExecAsync()
         {
             Log?.AppendLine($"$ git {Args}\n");
 
-            var start = CreateGitStartInfo(true);
             var errs = new List<string>();
-            var proc = new Process() { StartInfo = start };
+            using var proc = new Process();
+            proc.StartInfo = CreateGitStartInfo(true);
 
             proc.OutputDataReceived += (_, e) => HandleOutput(e.Data, errs);
             proc.ErrorDataReceived += (_, e) => HandleOutput(e.Data, errs);
@@ -67,7 +67,7 @@ public async Task<bool> ExecAsync()
             {
                 proc.Start();
 
-                // It not safe, please only use `CancellationToken` in readonly commands.
+                // Not safe, please only use `CancellationToken` in readonly commands.
                 if (CancellationToken.CanBeCanceled)
                 {
                     dummy = proc;
@@ -110,11 +110,9 @@ public async Task<bool> ExecAsync()
                 }
             }
 
-            int exitCode = proc.ExitCode;
-            proc.Close();
             Log?.AppendLine(string.Empty);
 
-            if (!CancellationToken.IsCancellationRequested && exitCode != 0)
+            if (!CancellationToken.IsCancellationRequested && proc.ExitCode != 0)
             {
                 if (RaiseError)
                 {
@@ -131,8 +129,8 @@ public async Task<bool> ExecAsync()
 
         protected async Task<Result> ReadToEndAsync()
         {
-            var start = CreateGitStartInfo(true);
-            var proc = new Process() { StartInfo = start };
+            using var proc = new Process();
+            proc.StartInfo = CreateGitStartInfo(true);
 
             try
             {
@@ -149,7 +147,6 @@ protected async Task<Result> ReadToEndAsync()
             await proc.WaitForExitAsync(CancellationToken).ConfigureAwait(false);
 
             rs.IsSuccess = proc.ExitCode == 0;
-            proc.Close();
             return rs;
         }
 
@@ -191,8 +188,8 @@ private ProcessStartInfo CreateGitStartInfo(bool redirect)
             // Force using this app as git editor.
             start.Arguments += Editor switch
             {
-                EditorType.CoreEditor => $"-c core.editor=\"\\\"{selfExecFile}\\\" --core-editor\" ",
-                EditorType.RebaseEditor => $"-c core.editor=\"\\\"{selfExecFile}\\\" --rebase-message-editor\" -c sequence.editor=\"\\\"{selfExecFile}\\\" --rebase-todo-editor\" -c rebase.abbreviateCommands=true ",
+                EditorType.CoreEditor => $"""-c core.editor="\"{selfExecFile}\" --core-editor" """,
+                EditorType.RebaseEditor => $"""-c core.editor="\"{selfExecFile}\" --rebase-message-editor" -c sequence.editor="\"{selfExecFile}\" --rebase-todo-editor" -c rebase.abbreviateCommands=true """,
                 _ => "-c core.editor=true ",
             };
 

src/Commands/GenerateCommitMessage.cs

@@ -67,10 +67,8 @@ await _service.ChatAsync(
                             });
                     }
 
-                    responseBuilder.Append("\n");
-                    summaryBuilder.Append("(file: ");
-                    summaryBuilder.Append(change.Path);
-                    summaryBuilder.Append(")\n");
+                    responseBuilder.AppendLine();
+                    summaryBuilder.AppendLine($"(file: {change.Path})");
                 }
 
                 if (_cancelToken.IsCancellationRequested)

src/Commands/QueryCommits.cs

@@ -80,8 +80,8 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
                         break;
                     case 2:
                         _current.ParseDecorators(line);
-                        if (_current.IsMerged && !_isHeadFounded)
-                            _isHeadFounded = true;
+                        if (_current.IsMerged && !_isHeadFound)
+                            _isHeadFound = true;
                         break;
                     case 3:
                         _current.Author = Models.User.FindOrAdd(line);
@@ -110,7 +110,7 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
             if (start < rs.StdOut.Length)
                 _current.Subject = rs.StdOut.Substring(start);
 
-            if (_findFirstMerged && !_isHeadFounded && _commits.Count > 0)
+            if (_findFirstMerged && !_isHeadFound && _commits.Count > 0)
                 await MarkFirstMergedAsync().ConfigureAwait(false);
 
             return _commits;
@@ -148,6 +148,6 @@ private async Task MarkFirstMergedAsync()
         private List<Models.Commit> _commits = new List<Models.Commit>();
         private Models.Commit _current = null;
         private bool _findFirstMerged = false;
-        private bool _isHeadFounded = false;
+        private bool _isHeadFound = false;
     }
 }

src/Commands/QueryFileContent.cs

@@ -21,11 +21,9 @@ public static async Task<Stream> RunAsync(string repo, string revision, string f
             var stream = new MemoryStream();
             try
             {
-                var proc = new Process() { StartInfo = starter };
-                proc.Start();
+                using var proc = Process.Start(starter);
                 await proc.StandardOutput.BaseStream.CopyToAsync(stream).ConfigureAwait(false);
                 await proc.WaitForExitAsync().ConfigureAwait(false);
-                proc.Close();
 
                 stream.Position = 0;
             }
@@ -52,14 +50,12 @@ public static async Task<Stream> FromLFSAsync(string repo, string oid, long size
             var stream = new MemoryStream();
             try
             {
-                var proc = new Process() { StartInfo = starter };
-                proc.Start();
+                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);
                 await proc.StandardOutput.BaseStream.CopyToAsync(stream).ConfigureAwait(false);
                 await proc.WaitForExitAsync().ConfigureAwait(false);
-                proc.Close();
 
                 stream.Position = 0;
             }

src/Commands/SaveChangesAsPatch.cs

@@ -62,14 +62,10 @@ private static async Task<bool> ProcessSingleChangeAsync(string repo, Models.Dif
 
             try
             {
-                var proc = new Process() { StartInfo = starter };
-                proc.Start();
+                using var proc = Process.Start(starter);
                 await proc.StandardOutput.BaseStream.CopyToAsync(writer).ConfigureAwait(false);
                 await proc.WaitForExitAsync().ConfigureAwait(false);
-                var rs = proc.ExitCode == 0;
-                proc.Close();
-
-                return rs;
+                return proc.ExitCode == 0;
             }
             catch (Exception e)
             {

src/Commands/SaveRevisionFile.cs

@@ -42,13 +42,11 @@ private static async Task ExecCmdAsync(string repo, string args, string outputFi
             {
                 try
                 {
-                    var proc = new Process() { StartInfo = starter };
-                    proc.Start();
+                    using var proc = Process.Start(starter);
                     if (input != null)
                         await proc.StandardInput.WriteAsync(await new StreamReader(input).ReadToEndAsync());
                     await proc.StandardOutput.BaseStream.CopyToAsync(sw);
                     await proc.WaitForExitAsync();
-                    proc.Close();
                 }
                 catch (Exception e)
                 {

src/Commands/UnstageChangesForAmend.cs

@@ -44,7 +44,7 @@ public UnstageChangesForAmend(string repo, List<Models.Change> changes)
                     _patchBuilder.Append(c.Path);
                 }
 
-                _patchBuilder.Append("\n");
+                _patchBuilder.AppendLine();
             }
         }
 
@@ -63,15 +63,13 @@ public async Task<bool> ExecAsync()
 
             try
             {
-                var proc = new Process() { StartInfo = starter };
-                proc.Start();
+                using var proc = Process.Start(starter);
                 await proc.StandardInput.WriteAsync(_patchBuilder.ToString());
                 proc.StandardInput.Close();
 
                 var err = await proc.StandardError.ReadToEndAsync().ConfigureAwait(false);
                 await proc.WaitForExitAsync().ConfigureAwait(false);
                 var rs = proc.ExitCode == 0;
-                proc.Close();
 
                 if (!rs)
                     App.RaiseException(_repo, err);

src/Models/AvatarManager.cs

@@ -82,11 +82,9 @@ public void Start()
                     Bitmap img = null;
                     try
                     {
-                        var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(2) };
-                        var task = client.GetAsync(url);
-                        task.Wait();
-
-                        var rsp = task.Result;
+                        using var client = new HttpClient();
+                        client.Timeout = TimeSpan.FromSeconds(2);
+                        var rsp = client.GetAsync(url).Result;
                         if (rsp.IsSuccessStatusCode)
                         {
                             using (var stream = rsp.Content.ReadAsStream())

src/Models/Commit.cs

@@ -110,10 +110,10 @@ public void ParseDecorators(string data)
 
             Decorators.Sort((l, r) =>
             {
-                if (l.Type != r.Type)
-                    return (int)l.Type - (int)r.Type;
-                else
-                    return NumericSort.Compare(l.Name, r.Name);
+                var delta = (int)l.Type - (int)r.Type;
+                if (delta != 0)
+                    return delta;
+                return NumericSort.Compare(l.Name, r.Name);
             });
         }
     }

src/Models/DiffOption.cs

@@ -96,7 +96,6 @@ public DiffOption(string baseRevision, string targetRevision, Change change)
         /// <summary>
         ///     Converts to diff command arguments.
         /// </summary>
-        /// <returns></returns>
         public override string ToString()
         {
             var builder = new StringBuilder();