Add TeamExplorerContext MEF service

Harden reflection code and add logging
Only fire StatusChanged on BranchName/HeadSha change
github · grokys · Jan 29, 2018 · grokys · Jan 29, 2018 · jcansdale
diff --git a/src/GitHub.App/Services/TeamExplorerContext.cs b/src/GitHub.App/Services/TeamExplorerContext.cs
+            this.log = log;
+            this.testing = testing;
+
+            gitExtType = gitExtType ?? FindGitExtType();
diff --git a/src/GitHub.App/Services/TeamExplorerContext.cs b/src/GitHub.App/Services/TeamExplorerContext.cs
+        bool testing;
+
+        [ImportingConstructor]
+        public TeamExplorerContext([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
diff --git a/src/GitHub.App/Services/TeamExplorerContext.cs b/src/GitHub.App/Services/TeamExplorerContext.cs
+            Type gitExtType, bool testing)
+        {
+            this.log = log;
+            this.testing = testing;
diff --git a/src/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModel.cs
+                    await ThreadingHelper.SwitchToMainThreadAsync();
+                    await UpdateContent(teamExplorerContext.ActiveRepository);
+                }
+            };
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestDetailViewModel.cs
@@ -322,7 +320,8 @@ public Uri WebUrl
                Number = number;
                WebUrl = LocalRepository.CloneUrl.ToRepositoryUrl().Append("pull/" + number);
                modelService = await modelServiceFactory.CreateAsync(connection);
-                vsGitExt.ActiveRepositoriesChanged += ActiveRepositoriesChanged;
+                sessionManager.PropertyChanged += ActiveRepositoriesChanged;
diff --git a/src/GitHub.Exports/Services/ITeamExplorerContext.cs b/src/GitHub.Exports/Services/ITeamExplorerContext.cs
+namespace GitHub.Services
+{
+    /// <summary>
+    /// Responsible for watching the active repository in Team Explorer.
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionManager.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionManager.cs
+            {
+                RepoChanged(teamExplorerContext.ActiveRepository).Forget();
+            };
+            teamExplorerContext.PropertyChanged += (s, e) =>
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionManager.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionManager.cs
+            teamExplorerContext.StatusChanged += (s, e) =>
+            {
+                RepoChanged(teamExplorerContext.ActiveRepository).Forget();
+            };
diff --git a/test/GitHub.App.UnitTests/GitHub.App.UnitTests.csproj b/test/GitHub.App.UnitTests/GitHub.App.UnitTests.csproj
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
diff --git a/test/UnitTests/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModelTests.cs b/test/UnitTests/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModelTests.cs
-            var target = CreateTarget(teServiceHolder: te);
+            var te = Substitute.For<ITeamExplorerContext>();
+            te.ActiveRepository.Returns(default(ILocalRepositoryModel));
+            var target = CreateTarget(teamExplorerContext: te);
diff --git a/src/GitHub.App/Services/TeamExplorerContext.cs b/src/GitHub.App/Services/TeamExplorerContext.cs
+        {
+            try
+            {
+                var repo = gitExt.ActiveRepositories?.FirstOrDefault();
diff --git a/src/GitHub.TeamFoundation.14/Services/VSGitExt.cs b/src/GitHub.TeamFoundation.14/Services/VSGitExt.cs
        }

+        void ContextChanged(object sender, VSUIContextChangedEventArgs e)
+        {
+            // If we're in the GitSccProvider context and TryInitialize succeeds, we can stop listening for events.
diff --git a/src/GitHub.TeamFoundation.14/Base/TeamExplorerServiceHolder.cs b/src/GitHub.TeamFoundation.14/Base/TeamExplorerServiceHolder.cs
            syncContext = SynchronizationContext.Current;
+
+            UpdateActiveRepo();
diff --git a/src/GitHub.TeamFoundation.14/Services/VSGitExt.cs b/src/GitHub.TeamFoundation.14/Services/VSGitExt.cs
+
+        void ContextChanged(object sender, VSUIContextChangedEventArgs e)
+        {
+            // If we're in the GitSccProvider context and TryInitialize succeeds, we can stop listening for events.
diff --git a/src/GitHub.TeamFoundation.14/Services/VSGitExt.cs b/src/GitHub.TeamFoundation.14/Services/VSGitExt.cs
+            catch (Exception e)
+            {
+                log.Error(e, "Error refreshing repositories");
+                ActiveRepositories = new ILocalRepositoryModel[0];
diff --git a/src/GitHub.TeamFoundation.14/Services/VSGitExt.cs b/src/GitHub.TeamFoundation.14/Services/VSGitExt.cs
@@ -25,7 +25,7 @@ public class VSGitExt : IVSGitExt
        readonly ILocalRepositoryModelFactory repositoryFactory;

        IGitExt gitService;
-        IEnumerable<ILocalRepositoryModel> activeRepositories;
+        IReadOnlyList<ILocalRepositoryModel> activeRepositories;
		syncContext = SynchronizationContext.Current;

		UpdateActiveRepo();