code_style: general cleanup (#1415)

* code_style:  general cleanup

* code_style: whitespace cleanup

Author: NathanBaulch

.editorconfig

@@ -100,7 +100,7 @@ dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
 dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
 
 dotnet_naming_style.camel_case_underscore_style.required_prefix = _
-dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case 
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
 
 # use accessibility modifiers
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

src/App.axaml.cs

@@ -301,7 +301,7 @@ public static async Task<string> GetClipboardTextAsync()
                     return await clipboard.GetTextAsync();
                 }
             }
-            return default;
+            return null;
         }
 
         public static string Text(string key, params object[] args)
@@ -323,8 +323,7 @@ public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key)
             icon.Height = 12;
             icon.Stretch = Stretch.Uniform;
 
-            var geo = Current?.FindResource(key) as StreamGeometry;
-            if (geo != null)
+            if (Current?.FindResource(key) is StreamGeometry geo)
                 icon.Data = geo;
 
             return icon;
@@ -682,8 +681,7 @@ private string FixFontFamilyName(string input)
                 }
 
                 var name = sb.ToString();
-                var idx = name.IndexOf('#');
-                if (idx >= 0)
+                if (name.Contains('#'))
                 {
                     if (!name.Equals("fonts:Inter#Inter", StringComparison.Ordinal) &&
                         !name.Equals("fonts:SourceGit#JetBrains Mono", StringComparison.Ordinal))

src/Commands/Blame.cs

@@ -51,7 +51,7 @@ public Models.BlameData Result()
 
         private void ParseLine(string line)
         {
-            if (line.IndexOf('\0', StringComparison.Ordinal) >= 0)
+            if (line.Contains('\0', StringComparison.Ordinal))
             {
                 _result.IsBinary = true;
                 _result.LineInfos.Clear();

src/Commands/Command.cs

@@ -194,7 +194,7 @@ private ProcessStartInfo CreateGitStartInfo()
 
         private void HandleOutput(string line, List<string> errs)
         {
-            line = line ?? string.Empty;
+            line ??= string.Empty;
             Log?.AppendLine(line);
 
             // Lines to hide in error message.

src/Commands/Commit.cs

@@ -34,6 +34,6 @@ public bool Run()
             return succ;
         }
 
-        private string _tmpFile = string.Empty;
+        private readonly string _tmpFile;
     }
 }

src/Commands/LFS.cs

@@ -10,7 +10,7 @@ public partial class LFS
         [GeneratedRegex(@"^(.+)\s+([\w.]+)\s+\w+:(\d+)$")]
         private static partial Regex REG_LOCK();
 
-        class SubCmd : Command
+        private class SubCmd : Command
         {
             public SubCmd(string repo, string args, Models.ICommandLog log)
             {

src/Commands/QueryCommitsForInteractiveRebase.cs

@@ -90,6 +90,6 @@ private void ParseParent(string data)
 
         private List<Models.InteractiveCommit> _commits = [];
         private Models.InteractiveCommit _current = null;
-        private string _boundary = "";
+        private readonly string _boundary;
     }
 }

src/Commands/QueryFileSize.cs

@@ -16,9 +16,6 @@ public QueryFileSize(string repo, string file, string revision)
 
         public long Result()
         {
-            if (_result != 0)
-                return _result;
-
             var rs = ReadToEnd();
             if (rs.IsSuccess)
             {
@@ -29,7 +26,5 @@ public long Result()
 
             return 0;
         }
-
-        private readonly long _result = 0;
     }
 }

src/Commands/UnstageChangesForAmend.cs

@@ -23,21 +23,18 @@ public UnstageChangesForAmend(string repo, List<Models.Change> changes)
                     _patchBuilder.Append(c.DataForAmend.ObjectHash);
                     _patchBuilder.Append("\t");
                     _patchBuilder.Append(c.OriginalPath);
-                    _patchBuilder.Append("\n");
                 }
                 else if (c.Index == Models.ChangeState.Added)
                 {
                     _patchBuilder.Append("0 0000000000000000000000000000000000000000\t");
                     _patchBuilder.Append(c.Path);
-                    _patchBuilder.Append("\n");
                 }
                 else if (c.Index == Models.ChangeState.Deleted)
                 {
                     _patchBuilder.Append("100644 ");
                     _patchBuilder.Append(c.DataForAmend.ObjectHash);
                     _patchBuilder.Append("\t");
                     _patchBuilder.Append(c.Path);
-                    _patchBuilder.Append("\n");
                 }
                 else
                 {
@@ -46,8 +43,9 @@ public UnstageChangesForAmend(string repo, List<Models.Change> changes)
                     _patchBuilder.Append(c.DataForAmend.ObjectHash);
                     _patchBuilder.Append("\t");
                     _patchBuilder.Append(c.Path);
-                    _patchBuilder.Append("\n");
                 }
+
+                _patchBuilder.Append("\n");
             }
         }
 

src/Models/AvatarManager.cs

@@ -38,7 +38,7 @@ public static AvatarManager Instance
         [GeneratedRegex(@"^(?:(\d+)\+)?(.+?)@.+\.github\.com$")]
         private static partial Regex REG_GITHUB_USER_EMAIL();
 
-        private object _synclock = new object();
+        private readonly Lock _synclock = new();
         private string _storePath;
         private List<IAvatarHost> _avatars = new List<IAvatarHost>();
         private Dictionary<string, Bitmap> _resources = new Dictionary<string, Bitmap>();
@@ -144,8 +144,7 @@ public Bitmap Request(string email, bool forceRefetch)
                 if (_defaultAvatars.Contains(email))
                     return null;
 
-                if (_resources.ContainsKey(email))
-                    _resources.Remove(email);
+                _resources.Remove(email);
 
                 var localFile = Path.Combine(_storePath, GetEmailHash(email));
                 if (File.Exists(localFile))
@@ -179,8 +178,7 @@ public Bitmap Request(string email, bool forceRefetch)
 
             lock (_synclock)
             {
-                if (!_requesting.Contains(email))
-                    _requesting.Add(email);
+                _requesting.Add(email);
             }
 
             return null;
@@ -200,10 +198,7 @@ public void SetFromLocal(string email, string file)
                 if (image == null)
                     return;
 
-                if (_resources.ContainsKey(email))
-                    _resources[email] = image;
-                else
-                    _resources.Add(email, image);
+                _resources[email] = image;
 
                 _requesting.Remove(email);