github · jcansdale · Mar 5, 2018 · Mar 2, 2018 · Mar 2, 2018 · Mar 2, 2018
diff --git a/src/GitHub.Exports/Settings/Guids.cs b/src/GitHub.Exports/Settings/Guids.cs
@@ -21,6 +21,9 @@ public static class Guids
         public const string GitSccProviderId = "11B8E6D7-C08B-4385-B321-321078CDD1F8";
         public const string TeamExplorerInstall3rdPartyGitTools = "DF785C7C-8454-4836-9686-D1C4A01D0BB9";
 
+        // UIContexts
+        public const string UIContext_Git = "565515AD-F4C1-4D59-BC14-AE77396DDDD7";
+
         // Guids defined in GitHub.VisualStudio.vsct
         public const string guidGitHubPkgString = "c3d3dc68-c977-411f-b3e8-03b0dccf7dfc";
         public const string guidAssemblyResolverPkgString = "a6424dba-34cb-360d-a4de-1b0b0411e57d";

diff --git a/src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs b/src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
 using System.Runtime.InteropServices;
+using GitHub.Helpers;
 using GitHub.Services;
 using GitHub.VisualStudio;
 using GitHub.InlineReviews.Services;
@@ -11,7 +12,7 @@ namespace GitHub.InlineReviews
 {
     [Guid(Guids.PullRequestStatusPackageId)]
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [ProvideAutoLoad(Guids.GitSccProviderId, PackageAutoLoadFlags.BackgroundLoad)]
+    [ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]
     public class PullRequestStatusBarPackage : AsyncPackage
     {
         /// <summary>
@@ -21,9 +22,11 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         {
             var usageTracker = (IUsageTracker)await GetServiceAsync(typeof(IUsageTracker));
             var serviceProvider = (IGitHubServiceProvider)await GetServiceAsync(typeof(IGitHubServiceProvider));
-            var gitExt = (IVSGitExt)await GetServiceAsync(typeof(IVSGitExt));
+            var barManager = new PullRequestStatusBarManager(usageTracker, serviceProvider);
 
-            new PullRequestStatusBarManager(gitExt, usageTracker, serviceProvider);
+            // await ThreadingHelper.SwitchToMainThreadAsync() won't return until after a solution
+            // has been loaded. We're using the following instead as a workaround.
+            await ThreadingHelper.MainThreadDispatcher.InvokeAsync(() => barManager.StartShowingStatus());
         }
     }
 }
diff --git a/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs b/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs
@@ -3,7 +3,6 @@
 using System.Windows.Input;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.ComponentModel;
 using System.ComponentModel.Composition;
 using GitHub.InlineReviews.Views;
 using GitHub.InlineReviews.ViewModels;
@@ -13,64 +12,50 @@
 using GitHub.Logging;
 using GitHub.Extensions;
 using Serilog;
+using ReactiveUI;
 
 namespace GitHub.InlineReviews.Services
 {
+    /// <summary>
+    /// Manage the UI that shows the PR for the current branch.
+    /// </summary>
     public class PullRequestStatusBarManager
     {
         static readonly ILogger log = LogManager.ForContext<PullRequestStatusBarManager>();
         const string StatusBarPartName = "PART_SccStatusBarHost";
 
-        readonly IVSGitExt gitExt;
         readonly IUsageTracker usageTracker;
         readonly IGitHubServiceProvider serviceProvider;
 
         IPullRequestSessionManager pullRequestSessionManager;
 
         [ImportingConstructor]
-        public PullRequestStatusBarManager(IVSGitExt gitExt, IUsageTracker usageTracker, IGitHubServiceProvider serviceProvider)
+        public PullRequestStatusBarManager(IUsageTracker usageTracker, IGitHubServiceProvider serviceProvider)
         {
-            this.gitExt = gitExt;
             this.usageTracker = usageTracker;
             this.serviceProvider = serviceProvider;
-
-            OnActiveRepositoriesChanged();
-            gitExt.ActiveRepositoriesChanged += OnActiveRepositoriesChanged;
-        }
-
-        void OnActiveRepositoriesChanged()
-        {
-            if (gitExt.ActiveRepositories.Count > 0)
-            {
-                gitExt.ActiveRepositoriesChanged -= OnActiveRepositoriesChanged;
-                Application.Current.Dispatcher.Invoke(() => StartShowingStatus());
-            }
         }
 
-        void StartShowingStatus()
+        /// <summary>
+        /// Start showing the PR for the active branch on the status bar.
+        /// </summary>
+        /// <remarks>
+        /// This must be called from the Main thread.
+        /// </remarks>
+        public void StartShowingStatus()
         {
             try
             {
-                // Create just in time on Main thread.
                 pullRequestSessionManager = serviceProvider.GetService<IPullRequestSessionManager>();
-
-                RefreshCurrentSession();
-                pullRequestSessionManager.PropertyChanged += PullRequestSessionManager_PropertyChanged;
+                pullRequestSessionManager.WhenAnyValue(x => x.CurrentSession)
+                    .Subscribe(x => RefreshCurrentSession());
             }
             catch (Exception e)
             {
                 log.Error(e, "Error initializing");
             }
         }
 
-        void PullRequestSessionManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(PullRequestSessionManager.CurrentSession))
-            {
-                RefreshCurrentSession();
-            }
-        }
-
         void RefreshCurrentSession()
         {
             var pullRequest = pullRequestSessionManager.CurrentSession?.PullRequest;

diff --git a/src/GitHub.VisualStudio/GitContextPackage.cs b/src/GitHub.VisualStudio/GitContextPackage.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+using Microsoft.VisualStudio.Shell;
+using GitHub.Services;
+using Task = System.Threading.Tasks.Task;
+
+namespace GitHub.VisualStudio
+{
+    /// <summary>
+    /// This package creates a custom UIContext <see cref="Guids.UIContext_Git"/> that is activated when a
+    /// repository is active in <see cref="IVSGitExt"/>.
+    /// </summary>
+    [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
+    [Guid(Guids.UIContext_Git)]
+    // this is the Git service GUID, so we load whenever it loads
+    [ProvideAutoLoad(Guids.GitSccProviderId, PackageAutoLoadFlags.BackgroundLoad)]
+    public class GitContextPackage : AsyncPackage
+    {
+        protected async override Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
+        {
+            var gitExt = (IVSGitExt)await GetServiceAsync(typeof(IVSGitExt));
+            var context = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));
+            RefreshContext(context, gitExt);
+            gitExt.ActiveRepositoriesChanged += () =>
+            {
+                RefreshContext(context, gitExt);
+            };
+        }
+
+        static void RefreshContext(UIContext context, IVSGitExt gitExt)
+        {
+            context.IsActive = gitExt.ActiveRepositories.Count > 0;
+        }
+    }
+}
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -306,6 +306,7 @@
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
     <Compile Include="AssemblyResolverPackage.cs" />
+    <Compile Include="GitContextPackage.cs" />
     <Compile Include="IServiceProviderPackage.cs" />
     <Compile Include="Menus\BlameLink.cs" />
     <Compile Include="Menus\MenuBase.cs" />

diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
@@ -7,7 +7,6 @@
 using System.Windows;
 using GitHub.Api;
 using GitHub.Extensions;
-using GitHub.Helpers;
 using GitHub.Info;
 using GitHub.Logging;
 using GitHub.Models;
@@ -28,8 +27,8 @@ namespace GitHub.VisualStudio
     [InstalledProductRegistration("#110", "#112", System.AssemblyVersionInformation.Version, IconResourceID = 400)]
     [Guid(Guids.guidGitHubPkgString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
-    // this is the Git service GUID, so we load whenever it loads
-    [ProvideAutoLoad(Guids.GitSccProviderId)]
+    // Only initialize when we're in the context of a Git repository.
+    [ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]
     [ProvideToolWindow(typeof(GitHubPane), Orientation = ToolWindowOrientation.Right, Style = VsDockStyle.Tabbed, Window = EnvDTE.Constants.vsWindowKindSolutionExplorer)]
     [ProvideOptionPage(typeof(OptionsPage), "GitHub for Visual Studio", "General", 0, 0, supportsAutomation: true)]
     public class GitHubPackage : AsyncPackage
@@ -56,7 +55,8 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
 
             await GetServiceAsync(typeof(IUsageTracker));
 
-            InitializeMenus().Forget();
+            // This package might be loaded on demand so we must await initialization of menus.
+            await InitializeMenus();
         }
 
         void LogVersionInformation()
@@ -76,8 +76,6 @@ async Task InitializeMenus()
                 return;
             }
 
-            await ThreadingHelper.SwitchToMainThreadAsync();
-
             foreach (var menu in menus.Menus)
                 serviceProvider.AddCommandHandler(menu.Guid, menu.CmdId, (s, e) => menu.Activate());