code_style: a few more to PR #1543

love-linger · love-linger · commit 8bdc1c597648 · 2025-07-09T16:37:12.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
@@ -618,8 +618,7 @@ private void Check4Update(bool manually = false)
                 try
                 {
                     // Fetch latest release information.
-                    using var client = new HttpClient();
-                    client.Timeout = TimeSpan.FromSeconds(5);
+                    using var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(5) };
                     var data = await client.GetStringAsync("https://sourcegit-scm.github.io/data/version.json");
 
                     // Parse JSON into Models.Version.
diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs
@@ -55,9 +55,9 @@ public async Task<bool> ExecAsync()
             Log?.AppendLine($"$ git {Args}\n");
 
             var errs = new List<string>();
+
             using var proc = new Process();
             proc.StartInfo = CreateGitStartInfo(true);
-
             proc.OutputDataReceived += (_, e) => HandleOutput(e.Data, errs);
             proc.ErrorDataReceived += (_, e) => HandleOutput(e.Data, errs);
 
@@ -129,8 +129,7 @@ public async Task<bool> ExecAsync()
 
         protected async Task<Result> ReadToEndAsync()
         {
-            using var proc = new Process();
-            proc.StartInfo = CreateGitStartInfo(true);
+            using var proc = new Process() { StartInfo = CreateGitStartInfo(true) };
 
             try
             {
diff --git a/src/Commands/QueryFileContent.cs b/src/Commands/QueryFileContent.cs
@@ -24,14 +24,13 @@ public static async Task<Stream> RunAsync(string repo, string revision, string f
                 using var proc = Process.Start(starter);
                 await proc.StandardOutput.BaseStream.CopyToAsync(stream).ConfigureAwait(false);
                 await proc.WaitForExitAsync().ConfigureAwait(false);
-
-                stream.Position = 0;
             }
             catch (Exception e)
             {
                 App.RaiseException(repo, $"Failed to query file content: {e}");
             }
 
+            stream.Position = 0;
             return stream;
         }
 
@@ -56,14 +55,13 @@ public static async Task<Stream> FromLFSAsync(string repo, string oid, long size
                 await proc.StandardInput.WriteLineAsync($"size {size}").ConfigureAwait(false);
                 await proc.StandardOutput.BaseStream.CopyToAsync(stream).ConfigureAwait(false);
                 await proc.WaitForExitAsync().ConfigureAwait(false);
-
-                stream.Position = 0;
             }
             catch (Exception e)
             {
                 App.RaiseException(repo, $"Failed to query file content: {e}");
             }
 
+            stream.Position = 0;
             return stream;
         }
     }
diff --git a/src/Commands/SaveRevisionFile.cs b/src/Commands/SaveRevisionFile.cs
@@ -43,10 +43,15 @@ private static async Task ExecCmdAsync(string repo, string args, string outputFi
                 try
                 {
                     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();
+                    {
+                        var inputString = await new StreamReader(input).ReadToEndAsync().ConfigureAwait(false);
+                        await proc.StandardInput.WriteAsync(inputString).ConfigureAwait(false);
+                    }
+
+                    await proc.StandardOutput.BaseStream.CopyToAsync(sw).ConfigureAwait(false);
+                    await proc.WaitForExitAsync().ConfigureAwait(false);
                 }
                 catch (Exception e)
                 {
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
@@ -48,13 +48,14 @@ public string FindTerminal(Models.ShellOrTerminal shell)
 
         public List<Models.ExternalTool> FindExternalTools()
         {
+            var localAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             var finder = new Models.ExternalToolsFinder();
             finder.VSCode(() => FindExecutable("code"));
             finder.VSCodeInsiders(() => FindExecutable("code-insiders"));
             finder.VSCodium(() => FindExecutable("codium"));
             finder.Cursor(() => FindExecutable("cursor"));
-            finder.Fleet(FindJetBrainsFleet);
-            finder.FindJetBrainsFromToolbox(() => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "JetBrains/Toolbox"));
+            finder.Fleet(() => FindJetBrainsFleet(localAppDataDir));
+            finder.FindJetBrainsFromToolbox(() => Path.Combine(localAppDataDir, "JetBrains/Toolbox"));
             finder.SublimeText(() => FindExecutable("subl"));
             finder.Zed(() => FindExecutable("zeditor"));
             return finder.Tools;
@@ -132,9 +133,9 @@ private string FindExecutable(string filename)
             return string.Empty;
         }
 
-        private string FindJetBrainsFleet()
+        private string FindJetBrainsFleet(string localAppDataDir)
         {
-            var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "JetBrains/Toolbox/apps/fleet/bin/Fleet");
+            var path = Path.Combine(localAppDataDir, "JetBrains/Toolbox/apps/fleet/bin/Fleet");
             return File.Exists(path) ? path : FindExecutable("fleet");
         }
     }
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
@@ -70,13 +70,14 @@ public string FindTerminal(Models.ShellOrTerminal shell)
 
         public List<Models.ExternalTool> FindExternalTools()
         {
+            var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
             var finder = new Models.ExternalToolsFinder();
             finder.VSCode(() => "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code");
             finder.VSCodeInsiders(() => "/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code");
             finder.VSCodium(() => "/Applications/VSCodium.app/Contents/Resources/app/bin/codium");
             finder.Cursor(() => "/Applications/Cursor.app/Contents/Resources/app/bin/cursor");
-            finder.Fleet(() => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Applications/Fleet.app/Contents/MacOS/Fleet"));
-            finder.FindJetBrainsFromToolbox(() => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library/Application Support/JetBrains/Toolbox"));
+            finder.Fleet(() => Path.Combine(home, "Applications/Fleet.app/Contents/MacOS/Fleet"));
+            finder.FindJetBrainsFromToolbox(() => Path.Combine(home, "Library/Application Support/JetBrains/Toolbox"));
             finder.SublimeText(() => "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl");
             finder.Zed(() => File.Exists("/usr/local/bin/zed") ? "/usr/local/bin/zed" : "/Applications/Zed.app/Contents/MacOS/cli");
             return finder.Tools;
diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
@@ -180,13 +180,14 @@ public string FindTerminal(Models.ShellOrTerminal shell)
 
         public List<Models.ExternalTool> FindExternalTools()
         {
+            var localAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             var finder = new Models.ExternalToolsFinder();
             finder.VSCode(FindVSCode);
             finder.VSCodeInsiders(FindVSCodeInsiders);
             finder.VSCodium(FindVSCodium);
             finder.Cursor(FindCursor);
-            finder.Fleet(() => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Programs\Fleet\Fleet.exe"));
-            finder.FindJetBrainsFromToolbox(() => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"JetBrains\Toolbox"));
+            finder.Fleet(() => Path.Combine(localAppDataDir, @"Programs\Fleet\Fleet.exe"));
+            finder.FindJetBrainsFromToolbox(() => Path.Combine(localAppDataDir, @"JetBrains\Toolbox"));
             finder.SublimeText(FindSublimeText);
             finder.TryAdd("Visual Studio", "vs", FindVisualStudio, GenerateCommandlineArgsForVisualStudio);
             return finder.Tools;
diff --git a/src/ViewModels/ConventionalCommitMessageBuilder.cs b/src/ViewModels/ConventionalCommitMessageBuilder.cs
@@ -77,19 +77,19 @@ public bool Apply()
             builder.Append(": ");
 
             builder.Append(_description);
-            builder.AppendLine("\n");
+            builder.AppendLine().AppendLine();
 
             if (!string.IsNullOrEmpty(_detail))
             {
                 builder.Append(_detail);
-                builder.AppendLine("\n");
+                builder.AppendLine().AppendLine();
             }
 
             if (!string.IsNullOrEmpty(_breakingChanges))
             {
                 builder.Append("BREAKING CHANGE: ");
                 builder.Append(_breakingChanges);
-                builder.AppendLine("\n");
+                builder.AppendLine().AppendLine();
             }
 
             if (!string.IsNullOrEmpty(_closedIssue))
diff --git a/src/ViewModels/ExecuteCustomAction.cs b/src/ViewModels/ExecuteCustomAction.cs
@@ -250,8 +250,7 @@ private async Task RunAsync(string args, Models.ICommandLog log)
             start.StandardErrorEncoding = Encoding.UTF8;
             start.WorkingDirectory = _repo.FullPath;
 
-            using var proc = new Process();
-            proc.StartInfo = start;
+            using var proc = new Process() { StartInfo = start };
             var builder = new StringBuilder();
 
             proc.OutputDataReceived += (_, e) =>
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
@@ -272,6 +272,7 @@ public void CheckoutBranchByCommit(Models.Commit commit)
                     _repo.CheckoutBranch(b);
                     return;
                 }
+
                 if (d.Type == Models.DecoratorType.RemoteBranchHead)
                 {
                     var rb = _repo.Branches.Find(x => x.FriendlyName == d.Name);

Original file line number	Diff line number	Diff line change
`@@ -618,8 +618,7 @@ private void Check4Update(bool manually = false)`
`618`	`618`	`try`
`619`	`619`	`{`
`620`	`620`	`// Fetch latest release information.`
`621`		`- using var client = new HttpClient();`
`622`		`- client.Timeout = TimeSpan.FromSeconds(5);`
	`621`	`+ using var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(5) };`
`623`	`622`	`var data = await client.GetStringAsync("https://sourcegit-scm.github.io/data/version.json");`
`624`	`623`
`625`	`624`	`// Parse JSON into Models.Version.`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,13 @@ public static async Task<Stream> RunAsync(string repo, string revision, string f`
`24`	`24`	`using var proc = Process.Start(starter);`
`25`	`25`	`await proc.StandardOutput.BaseStream.CopyToAsync(stream).ConfigureAwait(false);`
`26`	`26`	`await proc.WaitForExitAsync().ConfigureAwait(false);`
`27`		`-`
`28`		`- stream.Position = 0;`
`29`	`27`	`}`
`30`	`28`	`catch (Exception e)`
`31`	`29`	`{`
`32`	`30`	`App.RaiseException(repo, $"Failed to query file content: {e}");`
`33`	`31`	`}`
`34`	`32`
	`33`	`+ stream.Position = 0;`
`35`	`34`	`return stream;`
`36`	`35`	`}`
`37`	`36`
`@@ -56,14 +55,13 @@ public static async Task<Stream> FromLFSAsync(string repo, string oid, long size`
`56`	`55`	`await proc.StandardInput.WriteLineAsync($"size {size}").ConfigureAwait(false);`
`57`	`56`	`await proc.StandardOutput.BaseStream.CopyToAsync(stream).ConfigureAwait(false);`
`58`	`57`	`await proc.WaitForExitAsync().ConfigureAwait(false);`
`59`		`-`
`60`		`- stream.Position = 0;`
`61`	`58`	`}`
`62`	`59`	`catch (Exception e)`
`63`	`60`	`{`
`64`	`61`	`App.RaiseException(repo, $"Failed to query file content: {e}");`
`65`	`62`	`}`
`66`	`63`
	`64`	`+ stream.Position = 0;`
`67`	`65`	`return stream;`
`68`	`66`	`}`
`69`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,15 @@ private static async Task ExecCmdAsync(string repo, string args, string outputFi`
`43`	`43`	`try`
`44`	`44`	`{`
`45`	`45`	`using var proc = Process.Start(starter);`
	`46`	`+`
`46`	`47`	`if (input != null)`
`47`		`- await proc.StandardInput.WriteAsync(await new StreamReader(input).ReadToEndAsync());`
`48`		`- await proc.StandardOutput.BaseStream.CopyToAsync(sw);`
`49`		`- await proc.WaitForExitAsync();`
	`48`	`+ {`
	`49`	`+ var inputString = await new StreamReader(input).ReadToEndAsync().ConfigureAwait(false);`
	`50`	`+ await proc.StandardInput.WriteAsync(inputString).ConfigureAwait(false);`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ await proc.StandardOutput.BaseStream.CopyToAsync(sw).ConfigureAwait(false);`
	`54`	`+ await proc.WaitForExitAsync().ConfigureAwait(false);`
`50`	`55`	`}`
`51`	`56`	`catch (Exception e)`
`52`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,14 @@ public string FindTerminal(Models.ShellOrTerminal shell)`
`48`	`48`
`49`	`49`	`public List<Models.ExternalTool> FindExternalTools()`
`50`	`50`	`{`
	`51`	`+ var localAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);`
`51`	`52`	`var finder = new Models.ExternalToolsFinder();`
`52`	`53`	`finder.VSCode(() => FindExecutable("code"));`
`53`	`54`	`finder.VSCodeInsiders(() => FindExecutable("code-insiders"));`
`54`	`55`	`finder.VSCodium(() => FindExecutable("codium"));`
`55`	`56`	`finder.Cursor(() => FindExecutable("cursor"));`
`56`		`- finder.Fleet(FindJetBrainsFleet);`
`57`		`- finder.FindJetBrainsFromToolbox(() => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "JetBrains/Toolbox"));`
	`57`	`+ finder.Fleet(() => FindJetBrainsFleet(localAppDataDir));`
	`58`	`+ finder.FindJetBrainsFromToolbox(() => Path.Combine(localAppDataDir, "JetBrains/Toolbox"));`
`58`	`59`	`finder.SublimeText(() => FindExecutable("subl"));`
`59`	`60`	`finder.Zed(() => FindExecutable("zeditor"));`
`60`	`61`	`return finder.Tools;`
`@@ -132,9 +133,9 @@ private string FindExecutable(string filename)`
`132`	`133`	`return string.Empty;`
`133`	`134`	`}`
`134`	`135`
`135`		`- private string FindJetBrainsFleet()`
	`136`	`+ private string FindJetBrainsFleet(string localAppDataDir)`
`136`	`137`	`{`
`137`		`- var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "JetBrains/Toolbox/apps/fleet/bin/Fleet");`
	`138`	`+ var path = Path.Combine(localAppDataDir, "JetBrains/Toolbox/apps/fleet/bin/Fleet");`
`138`	`139`	`return File.Exists(path) ? path : FindExecutable("fleet");`
`139`	`140`	`}`
`140`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,19 +77,19 @@ public bool Apply()`
`77`	`77`	`builder.Append(": ");`
`78`	`78`
`79`	`79`	`builder.Append(_description);`
`80`		`- builder.AppendLine("\n");`
	`80`	`+ builder.AppendLine().AppendLine();`
`81`	`81`
`82`	`82`	`if (!string.IsNullOrEmpty(_detail))`
`83`	`83`	`{`
`84`	`84`	`builder.Append(_detail);`
`85`		`- builder.AppendLine("\n");`
	`85`	`+ builder.AppendLine().AppendLine();`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`if (!string.IsNullOrEmpty(_breakingChanges))`
`89`	`89`	`{`
`90`	`90`	`builder.Append("BREAKING CHANGE: ");`
`91`	`91`	`builder.Append(_breakingChanges);`
`92`		`- builder.AppendLine("\n");`
	`92`	`+ builder.AppendLine().AppendLine();`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if (!string.IsNullOrEmpty(_closedIssue))`
Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,7 @@ public void CheckoutBranchByCommit(Models.Commit commit)`
`272`	`272`	`_repo.CheckoutBranch(b);`
`273`	`273`	`return;`
`274`	`274`	`}`
	`275`	`+`
`275`	`276`	`if (d.Type == Models.DecoratorType.RemoteBranchHead)`
`276`	`277`	`{`
`277`	`278`	`var rb = _repo.Branches.Find(x => x.FriendlyName == d.Name);`