Specify UIThreadNormalPriority for methods that SwitchToMainThreadAsync

Author: jcansdale

src/GitHub.InlineReviews/InlineReviewsPackage.cs

@@ -30,13 +30,19 @@ protected override async Task InitializeAsync(
 
             // Avoid delays when there is ongoing UI activity.
             // See: https://github.com/github/VisualStudio/issues/1537
-            await JoinableTaskFactory.RunAsync(VsTaskRunContext.UIThreadNormalPriority, async () =>
-            {
-                await JoinableTaskFactory.SwitchToMainThreadAsync();
-                menuService.AddCommands(
-                    exports.GetExportedValue<INextInlineCommentCommand>(),
-                    exports.GetExportedValue<IPreviousInlineCommentCommand>());
-            });
+            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

@@ -8,7 +8,7 @@
 using Microsoft.VisualStudio.Shell;
 using Serilog;
 using Task = System.Threading.Tasks.Task;
-using GitHub.Helpers;
+using Microsoft.VisualStudio.Threading;
 
 namespace GitHub.InlineReviews
 {
@@ -23,19 +23,20 @@ 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);
 
-            // Avoid delays when there is ongoing UI activity.
-            // See: https://github.com/github/VisualStudio/issues/1537
-            await JoinableTaskFactory.RunAsync(VsTaskRunContext.UIThreadNormalPriority, async () =>
-            {
-                await JoinableTaskFactory.SwitchToMainThreadAsync();
-                barManager.StartShowingStatus();
-            });
+            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,21 +60,16 @@ async Task InitializeMenus()
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
 
-            // Avoid delays when there is ongoing UI activity.
-            // See: https://github.com/github/VisualStudio/issues/1537
-            await JoinableTaskFactory.RunAsync(VsTaskRunContext.UIThreadNormalPriority, async () =>
-            {
-                await JoinableTaskFactory.SwitchToMainThreadAsync();
-                menuService.AddCommands(
-                    exports.GetExportedValue<IAddConnectionCommand>(),
-                    exports.GetExportedValue<IBlameLinkCommand>(),
-                    exports.GetExportedValue<ICopyLinkCommand>(),
-                    exports.GetExportedValue<ICreateGistCommand>(),
-                    exports.GetExportedValue<IOpenLinkCommand>(),
-                    exports.GetExportedValue<IOpenPullRequestsCommand>(),
-                    exports.GetExportedValue<IShowCurrentPullRequestCommand>(),
-                    exports.GetExportedValue<IShowGitHubPaneCommand>());
-            });
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
+            menuService.AddCommands(
+                exports.GetExportedValue<IAddConnectionCommand>(),
+                exports.GetExportedValue<IBlameLinkCommand>(),
+                exports.GetExportedValue<ICopyLinkCommand>(),
+                exports.GetExportedValue<ICreateGistCommand>(),
+                exports.GetExportedValue<IOpenLinkCommand>(),
+                exports.GetExportedValue<IOpenPullRequestsCommand>(),
+                exports.GetExportedValue<IShowCurrentPullRequestCommand>(),
+                exports.GetExportedValue<IShowGitHubPaneCommand>());
         }
 
         async Task EnsurePackageLoaded(Guid packageGuid)