code_review: PR #1497

love-linger · love-linger · commit 3fe72e919cf2 · 2025-07-03T11:15:14.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/App.axaml.cs b/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;
diff --git a/src/Commands/QueryCommits.cs b/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))
diff --git a/src/ViewModels/BranchCompare.cs b/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;
diff --git a/src/ViewModels/BranchTreeNode.cs b/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)
diff --git a/src/ViewModels/CheckoutAndFastForward.cs b/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())
diff --git a/src/ViewModels/CreateBranch.cs b/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;
diff --git a/src/ViewModels/LFSLocks.cs b/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;
diff --git a/src/ViewModels/RevisionCompare.cs b/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);
diff --git a/src/ViewModels/WorkingCopy.cs b/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);
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/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)
                     {
diff --git a/src/Views/CommitRefsPresenter.cs b/src/Views/CommitRefsPresenter.cs
@@ -179,7 +179,7 @@ protected override Size MeasureOverride(Size availableSize)
                 return new Size(0, 0);
 
             var refs = commit.Decorators;
-            if (refs?.Count > 0)
+            if (refs is { Count: > 0 })
             {
                 var typeface = new Typeface(FontFamily);
                 var typefaceBold = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Bold);
diff --git a/src/Views/RevisionFileTreeView.axaml.cs b/src/Views/RevisionFileTreeView.axaml.cs
@@ -216,7 +216,7 @@ public void ToggleNodeIsExpanded(ViewModels.RevisionFileTreeNode node)
             if (node.IsExpanded)
             {
                 var subtree = GetChildrenOfTreeNode(node);
-                if (subtree?.Count > 0)
+                if (subtree is { Count: > 0 })
                 {
                     var subrows = new List<ViewModels.RevisionFileTreeNode>();
                     MakeRows(subrows, subtree, depth + 1);
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
@@ -101,7 +101,7 @@ public override void Render(DrawingContext context)
 
                 var lines = presenter.GetLines();
                 var view = TextView;
-                if (view?.VisualLinesValid ?? false)
+                if (view is { VisualLinesValid: true })
                 {
                     var typeface = view.CreateTypeface();
                     foreach (var line in view.VisualLines)
@@ -175,7 +175,7 @@ public override void Render(DrawingContext context)
 
                 var lines = presenter.GetLines();
                 var view = TextView;
-                if (view?.VisualLinesValid ?? false)
+                if (view is { VisualLinesValid: true })
                 {
                     var typeface = view.CreateTypeface();
                     foreach (var line in view.VisualLines)

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,6 @@ public static void SendNotification(string context, string message)`
`161`	`161`	`public static void SetLocale(string localeKey)`
`162`	`162`	`{`
`163`	`163`	`var app = Current as App;`
`164`		`-`
`165`	`164`	`var targetLocale = app?.Resources[localeKey] as ResourceDictionary;`
`166`	`165`	`if (targetLocale == null \|\| targetLocale == app._activeLocale)`
`167`	`166`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,6 @@ private void MarkFirstMerged()`
`133`	`133`	`return;`
`134`	`134`
`135`	`135`	`var set = new HashSet<string>(shas);`
`136`		`-`
`137`	`136`	`foreach (var c in _commits)`
`138`	`137`	`{`
`139`	`138`	`if (set.Contains(c.SHA))`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public List<Models.Change> SelectedChanges`
`49`	`49`	`{`
`50`	`50`	`if (SetProperty(ref _selectedChanges, value))`
`51`	`51`	`{`
`52`		`- if (value?.Count == 1)`
	`52`	`+ if (value is { Count: 1 })`
`53`	`53`	`DiffContext = new DiffContext(_repo, new Models.DiffOption(_based.Head, _to.Head, value[0]), _diffContext);`
`54`	`54`	`else`
`55`	`55`	`DiffContext = null;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using Avalonia;`
`4`		`-using AvaloniaEdit.Utils;`
`5`	`4`	`using CommunityToolkit.Mvvm.ComponentModel;`
`6`	`5`
`7`	`6`	`namespace SourceGit.ViewModels`
`@@ -87,7 +86,8 @@ public Builder(Models.BranchSortMode localSortMode, Models.BranchSortMode remote`
`87`	`86`
`88`	`87`	`public void SetExpandedNodes(List<string> expanded)`
`89`	`88`	`{`
`90`		`- _expanded.AddRange(expanded);`
	`89`	`+ foreach (var node in expanded)`
	`90`	`+ _expanded.Add(node);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public void Run(List<Models.Branch> branches, List<Models.Remote> remotes, bool bForceExpanded)`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public override Task<bool> Sure()`
`49`	`49`	`var updateSubmodules = IsRecurseSubmoduleVisible && RecurseSubmodules;`
`50`	`50`	`return Task.Run(() =>`
`51`	`51`	`{`
`52`		`- bool succ;`
	`52`	`+ var succ = false;`
`53`	`53`	`var needPopStash = false;`
`54`	`54`
`55`	`55`	`if (!_repo.ConfirmCheckoutBranch())`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public List<Models.Change> SelectedChanges`
`39`	`39`	`{`
`40`	`40`	`if (SetProperty(ref _selectedChanges, value))`
`41`	`41`	`{`
`42`		`- if (value?.Count == 1)`
	`42`	`+ if (value is { Count: 1 })`
`43`	`43`	`{`
`44`	`44`	`var option = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), value[0]);`
`45`	`45`	`DiffContext = new DiffContext(_repo, option, _diffContext);`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public List<Models.Change> SelectedUnstaged`
`167`	`167`	`}`
`168`	`168`	`else`
`169`	`169`	`{`
`170`		`- if (_selectedStaged?.Count > 0)`
	`170`	`+ if (_selectedStaged is { Count: > 0 })`
`171`	`171`	`SelectedStaged = [];`
`172`	`172`
`173`	`173`	`if (value.Count == 1)`
`@@ -193,7 +193,7 @@ public List<Models.Change> SelectedStaged`
`193`	`193`	`}`
`194`	`194`	`else`
`195`	`195`	`{`
`196`		`- if (_selectedUnstaged?.Count > 0)`
	`196`	`+ if (_selectedUnstaged is { Count: > 0 })`
`197`	`197`	`SelectedUnstaged = [];`
`198`	`198`
`199`	`199`	`if (value.Count == 1)`
`@@ -269,12 +269,12 @@ public void SetData(List<Models.Change> changes)`
`269`	`269`
`270`	`270`	`var lastSelectedUnstaged = new HashSet<string>();`
`271`	`271`	`var lastSelectedStaged = new HashSet<string>();`
`272`		`- if (_selectedUnstaged?.Count > 0)`
	`272`	`+ if (_selectedUnstaged is { Count: > 0 })`
`273`	`273`	`{`
`274`	`274`	`foreach (var c in _selectedUnstaged)`
`275`	`275`	`lastSelectedUnstaged.Add(c.Path);`
`276`	`276`	`}`
`277`		`- else if (_selectedStaged?.Count > 0)`
	`277`	`+ else if (_selectedStaged is { Count: > 0 })`
`278`	`278`	`{`
`279`	`279`	`foreach (var c in _selectedStaged)`
`280`	`280`	`lastSelectedStaged.Add(c.Path);`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,6 @@ private void UpdateDataSource(bool onlyViewModeChange)`
`380`	`380`	`else if (selected.Count > 0)`
`381`	`381`	`{`
`382`	`382`	`var sets = new HashSet<Models.Change>(selected);`
`383`		`-`
`384`	`383`	`var nodes = new List<ViewModels.ChangeTreeNode>();`
`385`	`384`	`foreach (var row in tree.Rows)`
`386`	`385`	`{`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ protected override Size MeasureOverride(Size availableSize)`
`179`	`179`	`return new Size(0, 0);`
`180`	`180`
`181`	`181`	`var refs = commit.Decorators;`
`182`		`- if (refs?.Count > 0)`
	`182`	`+ if (refs is { Count: > 0 })`
`183`	`183`	`{`
`184`	`184`	`var typeface = new Typeface(FontFamily);`
`185`	`185`	`var typefaceBold = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Bold);`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ public void ToggleNodeIsExpanded(ViewModels.RevisionFileTreeNode node)`
`216`	`216`	`if (node.IsExpanded)`
`217`	`217`	`{`
`218`	`218`	`var subtree = GetChildrenOfTreeNode(node);`
`219`		`- if (subtree?.Count > 0)`
	`219`	`+ if (subtree is { Count: > 0 })`
`220`	`220`	`{`
`221`	`221`	`var subrows = new List<ViewModels.RevisionFileTreeNode>();`
`222`	`222`	`MakeRows(subrows, subtree, depth + 1);`