Merge pull request #1538 from github/fixes/1537-SwitchToMainThreadAsync

Find workaround for SwitchToMainThreadAsync

Author: jcansdale

src/GitHub.InlineReviews/InlineReviewsPackage.cs

@@ -2,13 +2,13 @@
 using System.ComponentModel.Design;
 using System.Runtime.InteropServices;
 using System.Threading;
-using GitHub.Helpers;
 using GitHub.Commands;
 using GitHub.InlineReviews.Views;
 using GitHub.Services.Vssdk.Commands;
 using GitHub.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Threading;
 using Task = System.Threading.Tasks.Task;
 
 namespace GitHub.InlineReviews
@@ -28,7 +28,18 @@ protected override async Task InitializeAsync(
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
 
-            await ThreadingHelper.SwitchToMainThreadAsync();
+            // Avoid delays when there is ongoing UI activity.
+            // See: https://github.com/github/VisualStudio/issues/1537
+            await JoinableTaskFactory.RunAsync(VsTaskRunContext.UIThreadNormalPriority, InitializeMenus);
+        }
+
+        async Task InitializeMenus()
+        {
+            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
+            var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
+            var exports = componentModel.DefaultExportProvider;
+
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
             menuService.AddCommands(
                 exports.GetExportedValue<INextInlineCommentCommand>(),
                 exports.GetExportedValue<IPreviousInlineCommentCommand>());

src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Threading;
 using System.Runtime.InteropServices;
-using GitHub.Helpers;
 using GitHub.Services;
 using GitHub.VisualStudio;
 using GitHub.InlineReviews.Services;
 using Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;
+using Microsoft.VisualStudio.Threading;
 
 namespace GitHub.InlineReviews
 {
@@ -19,12 +19,19 @@ public class PullRequestStatusBarPackage : AsyncPackage
         /// Initialize the PR status UI on Visual Studio's status bar.
         /// </summary>
         protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
+        {
+            // Avoid delays when there is ongoing UI activity.
+            // See: https://github.com/github/VisualStudio/issues/1537
+            await JoinableTaskFactory.RunAsync(VsTaskRunContext.UIThreadNormalPriority, InitializeStatusBar);
+        }
+
+        async Task InitializeStatusBar()
         {
             var usageTracker = (IUsageTracker)await GetServiceAsync(typeof(IUsageTracker));
             var serviceProvider = (IGitHubServiceProvider)await GetServiceAsync(typeof(IGitHubServiceProvider));
             var barManager = new PullRequestStatusBarManager(usageTracker, serviceProvider);
 
-            await ThreadingHelper.SwitchToMainThreadAsync();
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
             barManager.StartShowingStatus();
         }
     }

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -41,8 +41,9 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
             await base.InitializeAsync(cancellationToken, progress);
             await GetServiceAsync(typeof(IUsageTracker));
 
-            // This package might be loaded on demand so we must await initialization of menus.
-            await InitializeMenus();
+            // Avoid delays when there is ongoing UI activity.
+            // See: https://github.com/github/VisualStudio/issues/1537
+            await JoinableTaskFactory.RunAsync(VsTaskRunContext.UIThreadNormalPriority, InitializeMenus);
         }
 
         void LogVersionInformation()
@@ -59,7 +60,7 @@ async Task InitializeMenus()
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
 
-            await ThreadingHelper.SwitchToMainThreadAsync();
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
             menuService.AddCommands(
                 exports.GetExportedValue<IAddConnectionCommand>(),
                 exports.GetExportedValue<IBlameLinkCommand>(),