Initialize VSGitExt in UICONTEXT.RepositoryOpen

We can be more precise and only initialize VSGitExt when in the
RepositoryOpen UIContext rather than the GitSccProvider UIContext.

Author: jcansdale

src/GitHub.TeamFoundation.14/Services/VSGitExt.cs

@@ -12,6 +12,7 @@
 using Microsoft.VisualStudio.Threading;
 using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
 using Task = System.Threading.Tasks.Task;
+using static Microsoft.VisualStudio.VSConstants;
 
 namespace GitHub.VisualStudio.Base
 {
@@ -51,9 +52,8 @@ public VSGitExt(IAsyncServiceProvider asyncServiceProvider, IVSUIContextFactory
             // Start with empty array until we have a chance to initialize.
             ActiveRepositories = Array.Empty<ILocalRepositoryModel>();
 
-            // The IGitExt service isn't available when a TFS based solution is opened directly.
-            // It will become available when moving to a Git based solution (and cause a UIContext event to fire).
-            var context = factory.GetUIContext(new Guid(Guids.GitSccProviderId));
+            // Initialize when we enter the context of a Git repository
+            var context = factory.GetUIContext(UICONTEXT.RepositoryOpen_guid);
             context.WhenActivated(() => JoinableTaskFactory.RunAsync(InitializeAsync).Task.Forget(log));
         }
 

test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs

@@ -13,14 +13,15 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
 using Task = System.Threading.Tasks.Task;
+using static Microsoft.VisualStudio.VSConstants;
 
 public class VSGitExtTests
 {
     public class TheConstructor : TestBaseClass
     {
         [TestCase(true, 1)]
         [TestCase(false, 0)]
-        public void GetServiceIGitExt_WhenSccProviderContextIsActive(bool isActive, int expectCalls)
+        public void GetServiceIGitExt_WhenRepositoryOpenIsActive(bool isActive, int expectCalls)
         {
             var context = CreateVSUIContext(isActive);
             var sp = Substitute.For<IAsyncServiceProvider>();
@@ -135,7 +136,7 @@ public void WhenUIContextChanged_FiredUsingThreadPoolThread()
     public class TheActiveRepositoriesProperty : TestBaseClass
     {
         [Test]
-        public void SccProviderContextNotActive_IsEmpty()
+        public void RepositoryOpenContextNotActive_IsEmpty()
         {
             var context = CreateVSUIContext(false);
             var target = CreateVSGitExt(context);
@@ -144,7 +145,7 @@ public void SccProviderContextNotActive_IsEmpty()
         }
 
         [Test]
-        public void SccProviderContextIsActive_InitializeWithActiveRepositories()
+        public void RepositoryOpenIsActive_InitializeWithActiveRepositories()
         {
             var repoPath = "repoPath";
             var repoFactory = Substitute.For<ILocalRepositoryModelFactory>();
@@ -217,8 +218,7 @@ static VSGitExt CreateVSGitExt(IVSUIContext context = null, IGitExt gitExt = nul
         repoFactory = repoFactory ?? Substitute.For<ILocalRepositoryModelFactory>();
         joinableTaskContext = joinableTaskContext ?? new JoinableTaskContext();
         var factory = Substitute.For<IVSUIContextFactory>();
-        var contextGuid = new Guid(Guids.GitSccProviderId);
-        factory.GetUIContext(contextGuid).Returns(context);
+        factory.GetUIContext(UICONTEXT.RepositoryOpen_guid).Returns(context);
         sp.GetServiceAsync(typeof(IGitExt)).Returns(gitExt);
         var vsGitExt = new VSGitExt(sp, factory, repoFactory, joinableTaskContext);
         vsGitExt.JoinTillEmpty();