code_style: general cleanup (#1525)

Author: NathanBaulch

src/App.Commands.cs

@@ -45,8 +45,7 @@ public static bool IsCheckForUpdateCommandVisible
         public static readonly Command QuitCommand = new Command(_ => Quit(0));
         public static readonly Command CopyTextBlockCommand = new Command(async p =>
         {
-            var textBlock = p as TextBlock;
-            if (textBlock == null)
+            if (p is not TextBlock textBlock)
                 return;
 
             if (textBlock.Inlines is { Count: > 0 } inlines)

src/App.axaml.cs

@@ -186,9 +186,7 @@ public static void SendNotification(string context, string message)
 
         public static void SetLocale(string localeKey)
         {
-            var app = Current as App;
-            var targetLocale = app?.Resources[localeKey] as ResourceDictionary;
-            if (targetLocale == null || targetLocale == app._activeLocale)
+            if (Current is not App app || app.Resources[localeKey] is not ResourceDictionary targetLocale || targetLocale == app._activeLocale)
                 return;
 
             if (app._activeLocale != null)
@@ -200,8 +198,7 @@ public static void SetLocale(string localeKey)
 
         public static void SetTheme(string theme, string themeOverridesFile)
         {
-            var app = Current as App;
-            if (app == null)
+            if (Current is not App app)
                 return;
 
             if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase))
@@ -254,8 +251,7 @@ public static void SetTheme(string theme, string themeOverridesFile)
 
         public static void SetFonts(string defaultFont, string monospaceFont, bool onlyUseMonospaceFontInEditor)
         {
-            var app = Current as App;
-            if (app == null)
+            if (Current is not App app)
                 return;
 
             if (app._fontsOverrides != null)

src/Commands/Blame.cs

@@ -40,9 +40,7 @@ public Blame(string repo, string file, string revision)
                 foreach (var line in _result.LineInfos)
                 {
                     if (line.CommitSHA.Length > _minSHALen)
-                    {
                         line.CommitSHA = line.CommitSHA.Substring(0, _minSHALen);
-                    }
                 }
             }
 

src/Commands/Command.cs

@@ -131,9 +131,9 @@ protected async Task<Result> ReadToEndAsync()
             }
 
             var rs = new Result() { IsSuccess = true };
-            rs.StdOut = await proc.StandardOutput.ReadToEndAsync().ConfigureAwait(false);
-            rs.StdErr = await proc.StandardError.ReadToEndAsync().ConfigureAwait(false);
-            await proc.WaitForExitAsync().ConfigureAwait(false);
+            rs.StdOut = await proc.StandardOutput.ReadToEndAsync(CancellationToken).ConfigureAwait(false);
+            rs.StdErr = await proc.StandardError.ReadToEndAsync(CancellationToken).ConfigureAwait(false);
+            await proc.WaitForExitAsync(CancellationToken).ConfigureAwait(false);
 
             rs.IsSuccess = proc.ExitCode == 0;
             proc.Close();

src/Commands/Diff.cs

@@ -249,14 +249,10 @@ private void ProcessInlineHighlights()
                         foreach (var chunk in chunks)
                         {
                             if (chunk.DeletedCount > 0)
-                            {
                                 left.Highlights.Add(new Models.TextInlineRange(chunk.DeletedStart, chunk.DeletedCount));
-                            }
 
                             if (chunk.AddedCount > 0)
-                            {
                                 right.Highlights.Add(new Models.TextInlineRange(chunk.AddedStart, chunk.AddedCount));
-                            }
                         }
                     }
                 }

src/Commands/QueryCommits.cs

@@ -121,7 +121,7 @@ private void ParseParent(string data)
             if (data.Length < 8)
                 return;
 
-            _current.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries));
+            _current.Parents.AddRange(data.Split(' ', StringSplitOptions.RemoveEmptyEntries));
         }
 
         private async Task MarkFirstMergedAsync()
@@ -133,9 +133,7 @@ private async Task MarkFirstMergedAsync()
             if (shas.Length == 0)
                 return;
 
-            var set = new HashSet<string>();
-            foreach (var sha in shas)
-                set.Add(sha);
+            var set = new HashSet<string>(shas);
 
             foreach (var c in _commits)
             {

src/Commands/QueryCommitsForInteractiveRebase.cs

@@ -86,7 +86,7 @@ private void ParseParent(string data)
             if (data.Length < 8)
                 return;
 
-            _current.Commit.Parents.AddRange(data.Split(separator: ' ', options: StringSplitOptions.RemoveEmptyEntries));
+            _current.Commit.Parents.AddRange(data.Split(' ', StringSplitOptions.RemoveEmptyEntries));
         }
 
         private List<Models.InteractiveCommit> _commits = [];

src/Commands/Submodule.cs

@@ -21,15 +21,10 @@ public async Task<bool> AddAsync(string url, string relativePath, bool recursive
                 return false;
 
             if (recursive)
-            {
                 Args = $"submodule update --init --recursive -- \"{relativePath}\"";
-                return await ExecAsync().ConfigureAwait(false);
-            }
             else
-            {
                 Args = $"submodule update --init -- \"{relativePath}\"";
-                return await ExecAsync().ConfigureAwait(false);
-            }
+            return await ExecAsync().ConfigureAwait(false);
         }
 
         public async Task<bool> SetURL(string path, string url)

src/Models/ApplyWhiteSpaceMode.cs

@@ -1,6 +1,6 @@
 namespace SourceGit.Models
 {
-    public class ApplyWhiteSpaceMode
+    public class ApplyWhiteSpaceMode(string n, string d, string a)
     {
         public static readonly ApplyWhiteSpaceMode[] Supported =
         [
@@ -10,15 +10,8 @@ public class ApplyWhiteSpaceMode
             new ApplyWhiteSpaceMode("Error All", "Similar to 'error', but shows more", "error-all"),
         ];
 
-        public string Name { get; set; }
-        public string Desc { get; set; }
-        public string Arg { get; set; }
-
-        public ApplyWhiteSpaceMode(string n, string d, string a)
-        {
-            Name = n;
-            Desc = d;
-            Arg = a;
-        }
+        public string Name { get; set; } = n;
+        public string Desc { get; set; } = d;
+        public string Arg { get; set; } = a;
     }
 }

src/Models/AvatarManager.cs

@@ -197,7 +197,10 @@ public void SetFromLocal(string email, string file)
 
                 _resources[email] = image;
 
-                _requesting.Remove(email);
+                lock (_synclock)
+                {
+                    _requesting.Remove(email);
+                }
 
                 var store = Path.Combine(_storePath, GetEmailHash(email));
                 File.Copy(file, store, true);