Notify PullRequestSessionManager when branch changes

src/GitHub.App/GitHub.App.csproj

@@ -138,6 +138,7 @@
     <Compile Include="Models\PullRequestReviewCommentModel.cs" />
     <Compile Include="Models\PullRequestDetailArgument.cs" />
     <Compile Include="Services\GlobalConnection.cs" />
+    <Compile Include="Services\TeamExplorerContext.cs" />
     <Compile Include="ViewModels\Dialog\GistCreationViewModel.cs" />
     <Compile Include="ViewModels\Dialog\GitHubDialogWindowViewModel.cs" />
     <Compile Include="ViewModels\Dialog\LoginCredentialsViewModel.cs" />

src/GitHub.App/Services/TeamExplorerContext.cs

@@ -0,0 +1,35 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Composition;
+using GitHub.Models;
+
+namespace GitHub.Services
+{
+    [Export(typeof(ITeamExplorerContext))]
+    [PartCreationPolicy(CreationPolicy.Shared)]
+    public class TeamExplorerContext : ITeamExplorerContext
+    {
+        readonly ITeamExplorerServiceHolder teamExplorerServiceHolder;
+
+        [ImportingConstructor]
+        public TeamExplorerContext(ITeamExplorerServiceHolder teamExplorerServiceHolder)
+        {
+            this.teamExplorerServiceHolder = teamExplorerServiceHolder;
+
+            teamExplorerServiceHolder.Subscribe(this, repo =>
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ActiveRepository)));
+            });
+
+            teamExplorerServiceHolder.StatusChanged += (s, e) =>
+            {
+                StatusChanged?.Invoke(this, e);
+            };
+        }
+
+        public ILocalRepositoryModel ActiveRepository => teamExplorerServiceHolder.ActiveRepo;
+
+        public event EventHandler StatusChanged;
+        public event PropertyChangedEventHandler PropertyChanged;
+    }
+}

src/GitHub.Exports/GitHub.Exports.csproj

@@ -154,6 +154,7 @@
     <Compile Include="Services\IEnterpriseProbeTask.cs" />
     <Compile Include="Services\IGlobalConnection.cs" />
     <Compile Include="Services\ILocalRepositories.cs" />
+    <Compile Include="Services\ITeamExplorerContext.cs" />
     <Compile Include="Services\IVisualStudioBrowser.cs" />
     <Compile Include="Models\UsageData.cs" />
     <Compile Include="Services\IUsageService.cs" />

src/GitHub.Exports/Services/ITeamExplorerContext.cs

@@ -0,0 +1,12 @@
+using System;
+using System.ComponentModel;
+using GitHub.Models;
+
+namespace GitHub.Services
+{
+    public interface ITeamExplorerContext : INotifyPropertyChanged
+    {
+        ILocalRepositoryModel ActiveRepository { get; }
+        event EventHandler StatusChanged;
+    }
+}

src/GitHub.Exports/Services/ITeamExplorerServiceHolder.cs

@@ -47,6 +47,11 @@ public interface ITeamExplorerServiceHolder
         /// Refresh the information on the active repo (in case of remote url changes or other such things)
         /// </summary>
         void Refresh();
+
+        /// <summary>
+        /// Fired when the repo or its status changes.
+        /// </summary>
+        event EventHandler StatusChanged;
     }
 
     public interface IGitAwareItem

src/GitHub.InlineReviews/Services/PullRequestSessionManager.cs

@@ -53,19 +53,24 @@ public PullRequestSessionManager(
             IPullRequestSessionService sessionService,
             IConnectionManager connectionManager,
             IModelServiceFactory modelServiceFactory,
-            ITeamExplorerServiceHolder teamExplorerService)
+            ITeamExplorerContext teamExplorerContext)
         {
             Guard.ArgumentNotNull(service, nameof(service));
             Guard.ArgumentNotNull(sessionService, nameof(sessionService));
             Guard.ArgumentNotNull(connectionManager, nameof(connectionManager));
             Guard.ArgumentNotNull(modelServiceFactory, nameof(modelServiceFactory));
-            Guard.ArgumentNotNull(teamExplorerService, nameof(teamExplorerService));
+            Guard.ArgumentNotNull(teamExplorerContext, nameof(teamExplorerContext));
 
             this.service = service;
             this.sessionService = sessionService;
             this.connectionManager = connectionManager;
             this.modelServiceFactory = modelServiceFactory;
-            teamExplorerService.Subscribe(this, x => RepoChanged(x).Forget());
+
+            RepoChanged(teamExplorerContext.ActiveRepository).Forget();
+            teamExplorerContext.StatusChanged += (s, e) =>
+            {
+                RepoChanged(teamExplorerContext.ActiveRepository).Forget();
+            };
         }
 
         /// <inheritdoc/>

src/GitHub.TeamFoundation.14/Base/TeamExplorerServiceHolder.cs

@@ -197,9 +197,14 @@ async void UIContextChanged(bool active, bool refresh)
         void UpdateActiveRepo()
         {
             var repo = gitService.ActiveRepositories.FirstOrDefault();
+
             if (!Equals(repo, ActiveRepo))
+            {
                 // so annoying that this is on the wrong thread
                 syncContext.Post(r => ActiveRepo = r as ILocalRepositoryModel, repo);
+            }
+
+            StatusChanged?.Invoke(this, EventArgs.Empty);
         }
 
         void ActiveRepoPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -269,6 +274,8 @@ IVSUIContextFactory UIContextFactory
                 return uiContextFactory;
             }
         }
+
+        public event EventHandler StatusChanged;
     }
 
     [Export(typeof(IVSUIContextFactory))]

test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj

@@ -143,7 +143,6 @@
     </Compile>
     <Compile Include="Services\DiffServiceTests.cs" />
     <Compile Include="Services\PullRequestSessionTests.cs" />
-    <Compile Include="TestDoubles\FakeTeamExplorerServiceHolder.cs" />
     <Compile Include="ViewModels\InlineCommentPeekViewModelTests.cs" />
     <Compile Include="ViewModels\InlineCommentThreadViewModelTests.cs" />
     <Compile Include="ViewModels\NewInlineCommentThreadViewModelTests.cs" />