code_review: PR #1497

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

Author: love-linger

src/App.axaml.cs

@@ -161,7 +161,6 @@ 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)
                 return;

src/Commands/QueryCommits.cs

@@ -133,7 +133,6 @@ private void MarkFirstMerged()
                 return;
 
             var set = new HashSet<string>(shas);
-
             foreach (var c in _commits)
             {
                 if (set.Contains(c.SHA))

src/ViewModels/BranchCompare.cs

@@ -49,7 +49,7 @@ public List<Models.Change> SelectedChanges
             {
                 if (SetProperty(ref _selectedChanges, value))
                 {
-                    if (value?.Count == 1)
+                    if (value is { Count: 1 })
                         DiffContext = new DiffContext(_repo, new Models.DiffOption(_based.Head, _to.Head, value[0]), _diffContext);
                     else
                         DiffContext = null;

src/ViewModels/BranchTreeNode.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Avalonia;
-using AvaloniaEdit.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -87,7 +86,8 @@ public Builder(Models.BranchSortMode localSortMode, Models.BranchSortMode remote
 
             public void SetExpandedNodes(List<string> expanded)
             {
-                _expanded.AddRange(expanded);
+                foreach (var node in expanded)
+                    _expanded.Add(node);
             }
 
             public void Run(List<Models.Branch> branches, List<Models.Remote> remotes, bool bForceExpanded)

src/ViewModels/CheckoutAndFastForward.cs

@@ -49,7 +49,7 @@ public override Task<bool> Sure()
             var updateSubmodules = IsRecurseSubmoduleVisible && RecurseSubmodules;
             return Task.Run(() =>
             {
-                bool succ;
+                var succ = false;
                 var needPopStash = false;
 
                 if (!_repo.ConfirmCheckoutBranch())

src/ViewModels/CreateBranch.cs

@@ -70,9 +70,7 @@ public CreateBranch(Repository repo, Models.Branch branch)
             _baseOnRevision = branch.IsDetachedHead ? branch.Head : branch.FullName;
 
             if (!branch.IsLocal && repo.Branches.Find(x => x.IsLocal && x.Name == branch.Name) == null)
-            {
                 Name = branch.Name;
-            }
 
             BasedOn = branch;
             DiscardLocalChanges = false;

src/ViewModels/LFSLocks.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 using Avalonia.Threading;
@@ -86,10 +87,17 @@ private void UpdateVisibleLocks()
         {
             var visible = new List<Models.LFSLock>();
 
-            foreach (var lfsLock in _cachedLocks)
+            if (!_showOnlyMyLocks)
             {
-                if (!_showOnlyMyLocks || lfsLock.User == _userName)
-                    visible.Add(lfsLock);
+                visible.AddRange(_cachedLocks);
+            }
+            else
+            {
+                foreach (var lfsLock in _cachedLocks)
+                {
+                    if (lfsLock.User.Equals(_userName, StringComparison.Ordinal))
+                        visible.Add(lfsLock);
+                }
             }
 
             VisibleLocks = visible;

src/ViewModels/RevisionCompare.cs

@@ -39,7 +39,7 @@ public List<Models.Change> SelectedChanges
             {
                 if (SetProperty(ref _selectedChanges, value))
                 {
-                    if (value?.Count == 1)
+                    if (value is { Count: 1 })
                     {
                         var option = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), value[0]);
                         DiffContext = new DiffContext(_repo, option, _diffContext);

src/ViewModels/WorkingCopy.cs

@@ -167,7 +167,7 @@ public List<Models.Change> SelectedUnstaged
                     }
                     else
                     {
-                        if (_selectedStaged?.Count > 0)
+                        if (_selectedStaged is { Count: > 0 })
                             SelectedStaged = [];
 
                         if (value.Count == 1)
@@ -193,7 +193,7 @@ public List<Models.Change> SelectedStaged
                     }
                     else
                     {
-                        if (_selectedUnstaged?.Count > 0)
+                        if (_selectedUnstaged is { Count: > 0 })
                             SelectedUnstaged = [];
 
                         if (value.Count == 1)
@@ -269,12 +269,12 @@ public void SetData(List<Models.Change> changes)
 
             var lastSelectedUnstaged = new HashSet<string>();
             var lastSelectedStaged = new HashSet<string>();
-            if (_selectedUnstaged?.Count > 0)
+            if (_selectedUnstaged is { Count: > 0 })
             {
                 foreach (var c in _selectedUnstaged)
                     lastSelectedUnstaged.Add(c.Path);
             }
-            else if (_selectedStaged?.Count > 0)
+            else if (_selectedStaged is { Count: > 0 })
             {
                 foreach (var c in _selectedStaged)
                     lastSelectedStaged.Add(c.Path);

src/Views/ChangeCollectionView.axaml.cs

@@ -380,7 +380,6 @@ private void UpdateDataSource(bool onlyViewModeChange)
                 else if (selected.Count > 0)
                 {
                     var sets = new HashSet<Models.Change>(selected);
-
                     var nodes = new List<ViewModels.ChangeTreeNode>();
                     foreach (var row in tree.Rows)
                     {