feature: auto select the next change after discarding one (#2704)

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/ViewModels/Discard.cs

@@ -55,10 +55,11 @@ public Discard(Repository repo)
             Mode = new DiscardAllMode();
         }
 
-        public Discard(Repository repo, List<Models.Change> changes)
+        public Discard(Repository repo, List<Models.Change> changes, Models.Change next)
         {
             _repo = repo;
             _changes = changes;
+            _next = next;
 
             if (_changes == null)
                 Mode = new DiscardAllMode();
@@ -87,11 +88,17 @@ public override async Task<bool> Sure()
             }
 
             log.Complete();
+
+            var selection = new ChangeSelection(null);
+            if (_next != null)
+                selection.Changes.Add(_next);
+            _repo.WorkingCopy.SelectedUnstaged = selection;
             _repo.MarkWorkingCopyDirtyManually();
             return true;
         }
 
         private readonly Repository _repo = null;
         private readonly List<Models.Change> _changes = null;
+        private readonly Models.Change _next = null;
     }
 }

src/ViewModels/WorkingCopy.cs

@@ -414,10 +414,10 @@ public void DiscardAllChanges()
                 _repo.ShowPopup(new Discard(_repo));
         }
 
-        public void Discard(List<Models.Change> changes)
+        public void Discard(List<Models.Change> changes, Models.Change next)
         {
             if (_repo.CanCreatePopup())
-                _repo.ShowPopup(new Discard(_repo, changes));
+                _repo.ShowPopup(new Discard(_repo, changes, next));
         }
 
         public void ClearFilter()

src/Views/WorkingCopy.axaml.cs

@@ -99,7 +99,8 @@ private async void OnUnstagedKeyDown(object _, KeyEventArgs e)
                 }
                 else if (e.Key is Key.Delete or Key.Back)
                 {
-                    vm.Discard(changes);
+                    var next = UnstagedChangesView.GetNextChangeWithoutSelection();
+                    vm.Discard(changes, next);
                     e.Handled = true;
                 }
                 else if (e.Key is Key.O && e.KeyModifiers == cmdKey && changes.Count == 1)
@@ -413,7 +414,8 @@ private ContextMenu CreateContextMenuForUnstagedChanges(ViewModels.Repository re
                     stage.Tag = "Enter/Space";
                     stage.Click += async (_, e) =>
                     {
-                        await vm.StageChangesAsync(changes, null);
+                        var next = UnstagedChangesView.GetNextChangeWithoutSelection();
+                        await vm.StageChangesAsync(changes, next);
                         e.Handled = true;
                     };
 
@@ -423,7 +425,8 @@ private ContextMenu CreateContextMenuForUnstagedChanges(ViewModels.Repository re
                     discard.Tag = "Back/Delete";
                     discard.Click += (_, e) =>
                     {
-                        vm.Discard(changes);
+                        var next = UnstagedChangesView.GetNextChangeWithoutSelection();
+                        vm.Discard(changes, next);
                         e.Handled = true;
                     };
 
@@ -818,7 +821,8 @@ private ContextMenu CreateContextMenuForUnstagedChanges(ViewModels.Repository re
                 stage.Tag = "Enter/Space";
                 stage.Click += async (_, e) =>
                 {
-                    await vm.StageChangesAsync(changes, null);
+                    var next = UnstagedChangesView.GetNextChangeWithoutSelection();
+                    await vm.StageChangesAsync(changes, next);
                     e.Handled = true;
                 };
 
@@ -828,7 +832,8 @@ private ContextMenu CreateContextMenuForUnstagedChanges(ViewModels.Repository re
                 discard.Tag = "Back/Delete";
                 discard.Click += (_, e) =>
                 {
-                    vm.Discard(changes);
+                    var next = UnstagedChangesView.GetNextChangeWithoutSelection();
+                    vm.Discard(changes, next);
                     e.Handled = true;
                 };
 
@@ -1020,7 +1025,8 @@ public ContextMenu CreateContextMenuForStagedChanges(ViewModels.Repository repo,
                 unstage.Tag = "Enter/Space";
                 unstage.Click += async (_, e) =>
                 {
-                    await vm.UnstageChangesAsync(changes, null);
+                    var next = StagedChangesView.GetNextChangeWithoutSelection();
+                    await vm.UnstageChangesAsync(changes, next);
                     e.Handled = true;
                 };
 
@@ -1234,7 +1240,8 @@ public ContextMenu CreateContextMenuForStagedChanges(ViewModels.Repository repo,
                 unstage.Tag = "Enter/Space";
                 unstage.Click += async (_, e) =>
                 {
-                    await vm.UnstageChangesAsync(changes, null);
+                    var next = StagedChangesView.GetNextChangeWithoutSelection();
+                    await vm.UnstageChangesAsync(changes, next);
                     e.Handled = true;
                 };