refactor: remove ConfigureAwait when we need to go back to UIThread after it

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

Author: love-linger

src/App.axaml.cs

@@ -148,14 +148,6 @@ public static void ShowWindow(object data, bool showAsDialog)
 
         public static async Task<bool> AskConfirmAsync(string message, Action onSure)
         {
-            if (!Dispatcher.UIThread.CheckAccess())
-            {
-                return await Dispatcher.UIThread.InvokeAsync<bool>(async () =>
-                {
-                    return await AskConfirmAsync(message, onSure);
-                });
-            }
-
             if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
             {
                 var confirm = new Views.Confirm();

src/Commands/Branch.cs

@@ -62,7 +62,7 @@ public static async Task<bool> DeleteRemoteAsync(string repo, string remote, str
         {
             bool exists = await new Remote(repo).HasBranchAsync(remote, name).ConfigureAwait(false);
             if (exists)
-                return await new Push(repo, remote, $"refs/heads/{name}", true) { Log = log }.ExecAsync().ConfigureAwait(false);
+                return await new Push(repo, remote, $"refs/heads/{name}", true) { Log = log }.RunAsync().ConfigureAwait(false);
 
             var cmd = new Command();
             cmd.WorkingDirectory = repo;

src/ViewModels/AIAssistant.cs

@@ -62,10 +62,10 @@ private void Gen()
             {
                 await new Commands.GenerateCommitMessage(_service, _repo.FullPath, _changes, _cancel.Token, message =>
                 {
-                    Dispatcher.UIThread.Invoke(() => Text = message);
-                }).ExecAsync();
+                    Dispatcher.UIThread.Post(() => Text = message);
+                }).ExecAsync().ConfigureAwait(false);
 
-                await Dispatcher.UIThread.InvokeAsync(() => IsGenerating = false);
+                Dispatcher.UIThread.Post(() => IsGenerating = false);
             }, _cancel.Token);
         }
 

src/ViewModels/AddRemote.cs

@@ -97,20 +97,17 @@ public override async Task<bool> Sure()
 
             var succ = await new Commands.Remote(_repo.FullPath)
                 .Use(log)
-                .AddAsync(_name, _url)
-                .ConfigureAwait(false);
+                .AddAsync(_name, _url);
 
             if (succ)
             {
                 await new Commands.Config(_repo.FullPath)
                     .Use(log)
-                    .SetAsync($"remote.{_name}.sshkey", _useSSH ? SSHKey : null)
-                    .ConfigureAwait(false);
+                    .SetAsync($"remote.{_name}.sshkey", _useSSH ? SSHKey : null);
 
                 await new Commands.Fetch(_repo.FullPath, _name, false, false)
                     .Use(log)
-                    .ExecAsync()
-                    .ConfigureAwait(false);
+                    .RunAsync();
             }
 
             log.Complete();

src/ViewModels/AddSubmodule.cs

@@ -61,8 +61,7 @@ public override async Task<bool> Sure()
 
             var succ = await new Commands.Submodule(_repo.FullPath)
                 .Use(log)
-                .AddAsync(_url, relativePath, Recursive)
-                .ConfigureAwait(false);
+                .AddAsync(_url, relativePath, Recursive);
 
             log.Complete();
             _repo.SetWatcherEnabled(true);

src/ViewModels/AddWorktree.cs

@@ -118,8 +118,7 @@ public override async Task<bool> Sure()
 
             var succ = await new Commands.Worktree(_repo.FullPath)
                 .Use(log)
-                .AddAsync(_path, branchName, _createNewBranch, tracking)
-                .ConfigureAwait(false);
+                .AddAsync(_path, branchName, _createNewBranch, tracking);
 
             log.Complete();
             _repo.SetWatcherEnabled(true);

src/ViewModels/Apply.cs

@@ -51,8 +51,7 @@ public override async Task<bool> Sure()
 
             var succ = await new Commands.Apply(_repo.FullPath, _patchFile, _ignoreWhiteSpace, SelectedWhiteSpaceMode.Arg, null)
                 .Use(log)
-                .ExecAsync()
-                .ConfigureAwait(false);
+                .ExecAsync();
 
             log.Complete();
             _repo.SetWatcherEnabled(true);

src/ViewModels/ApplyStash.cs

@@ -38,14 +38,12 @@ public override async Task<bool> Sure()
 
             var succ = await new Commands.Stash(_repo.FullPath)
                 .Use(log)
-                .ApplyAsync(Stash.Name, RestoreIndex)
-                .ConfigureAwait(false);
+                .ApplyAsync(Stash.Name, RestoreIndex);
 
             if (succ && DropAfterApply)
                 await new Commands.Stash(_repo.FullPath)
                     .Use(log)
-                    .DropAsync(Stash.Name)
-                    .ConfigureAwait(false);
+                    .DropAsync(Stash.Name);
 
             log.Complete();
             _repo.SetWatcherEnabled(true);

src/ViewModels/Archive.cs

@@ -54,8 +54,7 @@ public override async Task<bool> Sure()
 
             var succ = await new Commands.Archive(_repo.FullPath, _revision, _saveFile)
                 .Use(log)
-                .ExecAsync()
-                .ConfigureAwait(false);
+                .ExecAsync();
 
             log.Complete();
             _repo.SetWatcherEnabled(true);

src/ViewModels/AssumeUnchangedManager.cs

@@ -18,8 +18,7 @@ public AssumeUnchangedManager(Repository repo)
                 var collect = await new Commands.QueryAssumeUnchangedFiles(_repo.FullPath)
                     .GetResultAsync()
                     .ConfigureAwait(false);
-
-                await Dispatcher.UIThread.InvokeAsync(() => Files.AddRange(collect));
+                Dispatcher.UIThread.Post(() => Files.AddRange(collect));
             });
         }
 
@@ -31,8 +30,7 @@ public async Task RemoveAsync(string file)
 
                 await new Commands.AssumeUnchanged(_repo.FullPath, file, false)
                     .Use(log)
-                    .ExecAsync()
-                    .ConfigureAwait(false);
+                    .ExecAsync();
 
                 log.Complete();
                 Files.Remove(file);