refactor: use async instead of Task.Run

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

Author: love-linger

src/ViewModels/Repository.cs

@@ -1126,14 +1126,14 @@ public void StashAll(bool autoStart)
             _workingCopy?.StashAll(autoStart);
         }
 
-        public void SkipMerge()
+        public async Task SkipMergeAsync()
         {
-            _workingCopy?.SkipMerge();
+            await _workingCopy?.SkipMergeAsync();
         }
 
-        public void AbortMerge()
+        public async Task AbortMergeAsync()
         {
-            _workingCopy?.AbortMerge();
+            await _workingCopy?.AbortMergeAsync();
         }
 
         public List<(Models.CustomAction, CustomActionContextMenuLabel)> GetCustomActions(Models.CustomActionScope scope)

src/ViewModels/WorkingCopy.cs

@@ -545,88 +545,67 @@ public void UseExternalDiffTool(Models.Change change, bool isUnstaged)
             new Commands.DiffTool(_repo.FullPath, toolType, toolPath, opt).Open();
         }
 
-        public void ContinueMerge()
+        public async Task ContinueMergeAsync()
         {
-            IsCommitting = true;
-
             if (_inProgressContext != null)
             {
+                IsCommitting = true;
                 _repo.SetWatcherEnabled(false);
-                Task.Run(async () =>
-                {
-                    var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
-                    if (File.Exists(mergeMsgFile) && !string.IsNullOrWhiteSpace(_commitMessage))
-                        await File.WriteAllTextAsync(mergeMsgFile, _commitMessage);
 
-                    var succ = await _inProgressContext.ContinueAsync();
-                    await Dispatcher.UIThread.InvokeAsync(() =>
-                    {
-                        if (succ)
-                            CommitMessage = string.Empty;
+                var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
+                if (File.Exists(mergeMsgFile) && !string.IsNullOrWhiteSpace(_commitMessage))
+                    await File.WriteAllTextAsync(mergeMsgFile, _commitMessage);
 
-                        _repo.SetWatcherEnabled(true);
-                        IsCommitting = false;
-                    });
-                });
+                var succ = await _inProgressContext.ContinueAsync();
+                if (succ)
+                    CommitMessage = string.Empty;
+
+                _repo.SetWatcherEnabled(true);
+                IsCommitting = false;
             }
             else
             {
                 _repo.MarkWorkingCopyDirtyManually();
-                IsCommitting = false;
             }
         }
 
-        public void SkipMerge()
+        public async Task SkipMergeAsync()
         {
-            IsCommitting = true;
-
             if (_inProgressContext != null)
             {
+                IsCommitting = true;
                 _repo.SetWatcherEnabled(false);
-                Task.Run(async () =>
-                {
-                    var succ = await _inProgressContext.SkipAsync();
-                    await Dispatcher.UIThread.InvokeAsync(() =>
-                    {
-                        if (succ)
-                            CommitMessage = string.Empty;
 
-                        _repo.SetWatcherEnabled(true);
-                        IsCommitting = false;
-                    });
-                });
+                var succ = await _inProgressContext.SkipAsync();
+                if (succ)
+                    CommitMessage = string.Empty;
+
+                _repo.SetWatcherEnabled(true);
+                IsCommitting = false;
             }
             else
             {
                 _repo.MarkWorkingCopyDirtyManually();
-                IsCommitting = false;
             }
         }
 
-        public void AbortMerge()
+        public async Task AbortMergeAsync()
         {
-            IsCommitting = true;
-
             if (_inProgressContext != null)
             {
+                IsCommitting = true;
                 _repo.SetWatcherEnabled(false);
-                Task.Run(async () =>
-                {
-                    var succ = await _inProgressContext.AbortAsync();
-                    await Dispatcher.UIThread.InvokeAsync(() =>
-                    {
-                        if (succ)
-                            CommitMessage = string.Empty;
 
-                        _repo.SetWatcherEnabled(true);
-                        IsCommitting = false;
-                    });
-                });
+                var succ = await _inProgressContext.AbortAsync();
+                if (succ)
+                    CommitMessage = string.Empty;
+
+                _repo.SetWatcherEnabled(true);
+                IsCommitting = false;
             }
             else
             {
                 _repo.MarkWorkingCopyDirtyManually();
-                IsCommitting = false;
             }
         }
 

src/Views/Repository.axaml

@@ -685,7 +685,7 @@
                 BorderThickness="0"
                 Content="{DynamicResource Text.Repository.Abort}"
                 Padding="8,2" Margin="0,0,8,0"
-                Command="{Binding AbortMerge}"/>
+                Click="OnAbortInProgress"/>
       </Grid>
 
       <Grid Grid.Row="1"

src/Views/Repository.axaml.cs

@@ -643,10 +643,18 @@ private void OnOpenSortTagMenu(object sender, RoutedEventArgs e)
             e.Handled = true;
         }
 
-        private void OnSkipInProgress(object sender, RoutedEventArgs e)
+        private async void OnSkipInProgress(object sender, RoutedEventArgs e)
         {
             if (DataContext is ViewModels.Repository repo)
-                repo.SkipMerge();
+                await repo.SkipMergeAsync();
+
+            e.Handled = true;
+        }
+
+        private async void OnAbortInProgress(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.Repository repo)
+                await repo.AbortMergeAsync();
 
             e.Handled = true;
         }

src/Views/WorkingCopy.axaml

@@ -284,7 +284,7 @@
                      Height="28"
                      Margin="8,0,0,0"
                      Padding="8,0"
-                     Command="{Binding ContinueMerge}"
+                     Click="OnContinue"
                      IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}">
           <SplitButton.IsEnabled>
             <MultiBinding Converter="{x:Static BoolConverters.And}">

src/Views/WorkingCopy.axaml.cs

@@ -181,6 +181,15 @@ private async void OnOpenExternalMergeToolAllConflicts(object _, RoutedEventArgs
         {
             if (DataContext is ViewModels.WorkingCopy vm)
                 await vm.UseExternalMergeToolAsync(null);
+
+            e.Handled = true;
+        }
+
+        private async void OnContinue(object _, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.WorkingCopy vm)
+                await vm.ContinueMergeAsync();
+
             e.Handled = true;
         }