Remove dependency on IComponentModel

Retrieve IVSGitExt and IPullRequestSessionManager via GitHubServiceProvider.

Author: jcansdale

src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Threading;
 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 Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;
 
 namespace GitHub.InlineReviews
@@ -23,13 +22,10 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         {
             var usageTracker = (IUsageTracker)await GetServiceAsync(typeof(IUsageTracker));
             var serviceProvider = (IGitHubServiceProvider)await GetServiceAsync(typeof(IGitHubServiceProvider));
-            var componentModel = (IComponentModel)await GetServiceAsync(typeof(SComponentModel));
-            var pullRequestSessionManager = componentModel.DefaultExportProvider.GetExport<IPullRequestSessionManager>();
 
             await ThreadingHelper.SwitchToMainThreadAsync();
-            var gitExt = componentModel.DefaultExportProvider.GetExportedValue<IVSGitExt>();
-
-            new PullRequestStatusBarManager(gitExt, pullRequestSessionManager, usageTracker, serviceProvider);
+            var gitExt = serviceProvider.GetService<IVSGitExt>();
+            new PullRequestStatusBarManager(gitExt, usageTracker, serviceProvider);
         }
     }
 }

src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs

@@ -24,16 +24,15 @@ public class PullRequestStatusBarManager
         const string StatusBarPartName = "PART_SccStatusBarHost";
 
         readonly IVSGitExt gitExt;
-        readonly Lazy<IPullRequestSessionManager> pullRequestSessionManager;
         readonly IUsageTracker usageTracker;
         readonly IGitHubServiceProvider serviceProvider;
 
+        IPullRequestSessionManager pullRequestSessionManager;
+
         [ImportingConstructor]
-        public PullRequestStatusBarManager(IVSGitExt gitExt, Lazy<IPullRequestSessionManager> pullRequestSessionManager,
-            IUsageTracker usageTracker, IGitHubServiceProvider serviceProvider)
+        public PullRequestStatusBarManager(IVSGitExt gitExt, IUsageTracker usageTracker, IGitHubServiceProvider serviceProvider)
         {
             this.gitExt = gitExt;
-            this.pullRequestSessionManager = pullRequestSessionManager;
             this.usageTracker = usageTracker;
             this.serviceProvider = serviceProvider;
 
@@ -56,8 +55,11 @@ async Task StartShowingStatus()
             {
                 await ThreadingHelper.SwitchToMainThreadAsync(); // Switch from VSGitExt to Main thread
 
+                // Create just in time on Main thread.
+                pullRequestSessionManager = serviceProvider.GetService<IPullRequestSessionManager>();
+
                 RefreshCurrentSession();
-                pullRequestSessionManager.Value.PropertyChanged += PullRequestSessionManager_PropertyChanged;
+                pullRequestSessionManager.PropertyChanged += PullRequestSessionManager_PropertyChanged;
             }
             catch (Exception e)
             {
@@ -75,7 +77,7 @@ void PullRequestSessionManager_PropertyChanged(object sender, PropertyChangedEve
 
         void RefreshCurrentSession()
         {
-            var pullRequest = pullRequestSessionManager.Value.CurrentSession?.PullRequest;
+            var pullRequest = pullRequestSessionManager.CurrentSession?.PullRequest;
             var viewModel = pullRequest != null ? CreatePullRequestStatusViewModel(pullRequest) : null;
             ShowStatus(viewModel);
         }