Load VS services asynchronously

Only IVSGitExt needs to be loaded synchronously.

Author: jcansdale

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -93,7 +93,6 @@
     <Compile Include="Models\InlineCommentThreadModel.cs" />
     <Compile Include="Models\PullRequestSessionLiveFile.cs" />
     <Compile Include="Models\PullRequestSessionFile.cs" />
-    <Compile Include="Services\IPullRequestStatusBarManager.cs" />
     <Compile Include="Services\PullRequestStatusBarManager.cs" />
     <Compile Include="Tags\MouseEnterAndLeaveEventRouter.cs" />
     <Compile Include="Peek\InlineCommentPeekableItem.cs" />

src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs

@@ -3,6 +3,8 @@
 using System.Runtime.InteropServices;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.ComponentModelHost;
+using GitHub.Helpers;
+using GitHub.Services;
 using GitHub.VisualStudio;
 using GitHub.InlineReviews.Services;
 using Task = System.Threading.Tasks.Task;
@@ -19,10 +21,15 @@ public class PullRequestStatusBarPackage : AsyncPackage
         /// </summary>
         protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
+            var usageTracker = (IUsageTracker)await GetServiceAsync(typeof(IUsageTracker));
+            var serviceProvider = (IGitHubServiceProvider)await GetServiceAsync(typeof(IGitHubServiceProvider));
             var componentModel = (IComponentModel)await GetServiceAsync(typeof(SComponentModel));
-            var exportProvider = componentModel.DefaultExportProvider;
-            var pullRequestStatusManager = exportProvider.GetExportedValue<IPullRequestStatusBarManager>();
-            await pullRequestStatusManager.InitializeAsync();
+            var pullRequestSessionManager = componentModel.DefaultExportProvider.GetExport<IPullRequestSessionManager>();
+
+            await ThreadingHelper.SwitchToMainThreadAsync();
+            var gitExt = componentModel.DefaultExportProvider.GetExportedValue<IVSGitExt>();
+
+            new PullRequestStatusBarManager(gitExt, pullRequestSessionManager, usageTracker, serviceProvider);
         }
     }
 }

src/GitHub.InlineReviews/Services/IPullRequestStatusBarManager.cs

@@ -18,45 +18,35 @@
 
 namespace GitHub.InlineReviews.Services
 {
-    [Export(typeof(IPullRequestStatusBarManager))]
-    public class PullRequestStatusBarManager : IPullRequestStatusBarManager
+    public class PullRequestStatusBarManager
     {
         static readonly ILogger log = LogManager.ForContext<PullRequestStatusBarManager>();
         const string StatusBarPartName = "PART_SccStatusBarHost";
 
-        readonly Lazy<IVSGitExt> gitExt;
+        readonly IVSGitExt gitExt;
         readonly Lazy<IPullRequestSessionManager> pullRequestSessionManager;
         readonly IUsageTracker usageTracker;
         readonly IGitHubServiceProvider serviceProvider;
 
         [ImportingConstructor]
-        public PullRequestStatusBarManager(Lazy<IVSGitExt> gitExt, Lazy<IPullRequestSessionManager> pullRequestSessionManager,
+        public PullRequestStatusBarManager(IVSGitExt gitExt, Lazy<IPullRequestSessionManager> pullRequestSessionManager,
             IUsageTracker usageTracker, IGitHubServiceProvider serviceProvider)
         {
             this.gitExt = gitExt;
             this.pullRequestSessionManager = pullRequestSessionManager;
             this.usageTracker = usageTracker;
             this.serviceProvider = serviceProvider;
-        }
-
-        /// <summary>
-        /// Lazily initialize when user enters the context of a GitHub repository.
-        /// </summary>
-        /// <param name="window">Visual Studio's main window.</param>
-        public async Task InitializeAsync()
-        {
-            await ThreadingHelper.SwitchToMainThreadAsync();
 
             OnActiveRepositoriesChanged();
-            gitExt.Value.ActiveRepositoriesChanged += OnActiveRepositoriesChanged;
+            gitExt.ActiveRepositoriesChanged += OnActiveRepositoriesChanged;
         }
 
         void OnActiveRepositoriesChanged()
         {
-            if (gitExt.Value.ActiveRepositories.Count > 0)
+            if (gitExt.ActiveRepositories.Count > 0)
             {
                 StartShowingStatus().Forget();
-                gitExt.Value.ActiveRepositoriesChanged -= OnActiveRepositoriesChanged;
+                gitExt.ActiveRepositoriesChanged -= OnActiveRepositoriesChanged;
             }
         }