[Feature] Show current PR on status bar

src/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModel.cs

@@ -49,8 +49,7 @@ public sealed class GitHubPaneViewModel : ViewModelBase, IGitHubPaneViewModel, I
         readonly ReactiveCommand<Unit> refresh;
         readonly ReactiveCommand<Unit> showPullRequests;
         readonly ReactiveCommand<object> openInBrowser;
-        readonly SemaphoreSlim initializing = new SemaphoreSlim(1);
-        bool initialized;
+        Task initializeTask;
         IViewModel content;
         ILocalRepositoryModel localRepository;
         string searchQuery;
@@ -201,39 +200,9 @@ public void Dispose()
         }
 
         /// <inheritdoc/>
-        public async Task InitializeAsync(IServiceProvider paneServiceProvider)
+        public Task InitializeAsync(IServiceProvider paneServiceProvider)
         {
-            await initializing.WaitAsync();
-            if (initialized) return;
-
-            try
-            {
-                await UpdateContent(teamExplorerContext.ActiveRepository);
-                teamExplorerContext.WhenAnyValue(x => x.ActiveRepository)
-                   .Skip(1)
-                   .ObserveOn(RxApp.MainThreadScheduler)
-                   .Subscribe(x => UpdateContent(x).Forget());
-
-                connectionManager.Connections.CollectionChanged += (_, __) => UpdateContent(LocalRepository).Forget();
-
-                BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.pullRequestCommand, showPullRequests);
-                BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.backCommand, navigator.NavigateBack);
-                BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.forwardCommand, navigator.NavigateForward);
-                BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.refreshCommand, refresh);
-                BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.githubCommand, openInBrowser);
-
-                paneServiceProvider.AddCommandHandler(Guids.guidGitHubToolbarCmdSet, PkgCmdIDList.helpCommand,
-                     (_, __) =>
-                     {
-                         browser.OpenUrl(new Uri(GitHubUrls.Documentation));
-                         usageTracker.IncrementCounter(x => x.NumberOfGitHubPaneHelpClicks).Forget();
-                     });
-            }
-            finally
-            {
-                initialized = true;
-                initializing.Release();
-            }
+            return initializeTask = initializeTask ?? CreateInitializeTask(paneServiceProvider);
         }
 
         /// <inheritdoc/>
@@ -307,6 +276,30 @@ public Task ShowPullRequest(string owner, string repo, int number)
                 x => x.RemoteRepositoryOwner == owner && x.LocalRepository.Name == repo && x.Number == number);
         }
 
+        async Task CreateInitializeTask(IServiceProvider paneServiceProvider)
+        {
+            await UpdateContent(teamExplorerContext.ActiveRepository);
+            teamExplorerContext.WhenAnyValue(x => x.ActiveRepository)
+                .Skip(1)
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .Subscribe(x => UpdateContent(x).Forget());
+
+            connectionManager.Connections.CollectionChanged += (_, __) => UpdateContent(LocalRepository).Forget();
+
+            BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.pullRequestCommand, showPullRequests);
+            BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.backCommand, navigator.NavigateBack);
+            BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.forwardCommand, navigator.NavigateForward);
+            BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.refreshCommand, refresh);
+            BindNavigatorCommand(paneServiceProvider, PkgCmdIDList.githubCommand, openInBrowser);
+
+            paneServiceProvider.AddCommandHandler(Guids.guidGitHubToolbarCmdSet, PkgCmdIDList.helpCommand,
+                    (_, __) =>
+                    {
+                        browser.OpenUrl(new Uri(GitHubUrls.Documentation));
+                        usageTracker.IncrementCounter(x => x.NumberOfGitHubPaneHelpClicks).Forget();
+                    });
+        }
+
         OleMenuCommand BindNavigatorCommand<T>(IServiceProvider paneServiceProvider, int commandId, ReactiveCommand<T> command)
         {
             Guard.ArgumentNotNull(paneServiceProvider, nameof(paneServiceProvider));

src/GitHub.Exports/Models/UsageModel.cs

@@ -42,6 +42,7 @@ public struct UsageModel
         public int NumberOfPRDetailsNavigateToEditor { get; set; }
         public int NumberOfPRReviewDiffViewInlineCommentOpen { get; set; }
         public int NumberOfPRReviewDiffViewInlineCommentPost { get; set; }
+        public int NumberOfShowCurrentPullRequest { get; set; }
 
         public UsageModel Clone(bool includeWeekly, bool includeMonthly)
         {

src/GitHub.Exports/Services/IVSUIContextFactory.cs

@@ -20,6 +20,6 @@ public VSUIContextChangedEventArgs(bool activated)
     public interface IVSUIContext
     {
         bool IsActive { get; }
-        event EventHandler<VSUIContextChangedEventArgs> UIContextChanged;
+        void WhenActivated(Action action);
     }
 }

src/GitHub.Exports/Settings/Guids.cs

@@ -13,6 +13,7 @@ public static class Guids
         public const string StartPagePackageId = "3b764d23-faf7-486f-94c7-b3accc44a70e";
         public const string CodeContainerProviderId = "6CE146CB-EF57-4F2C-A93F-5BA685317660";
         public const string InlineReviewsPackageId = "248325BE-4A2D-4111-B122-E7D59BF73A35";
+        public const string PullRequestStatusPackageId = "5121BEC6-1088-4553-8453-0DDC7C8E2238";
         public const string TeamExplorerWelcomeMessage = "C529627F-8AA6-4FDB-82EB-4BFB7DB753C3";
         public const string LoginManagerId = "7BA2071A-790A-4F95-BE4A-0EEAA5928AAF";
 

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -88,10 +88,12 @@
     <Compile Include="Glyph\GlyphMargin.cs" />
     <Compile Include="Glyph\GlyphMarginVisualManager.cs" />
     <Compile Include="Glyph\IGlyphFactory.cs" />
+    <Compile Include="PullRequestStatusBarPackage.cs" />
     <Compile Include="InlineReviewsPackage.cs" />
     <Compile Include="Models\InlineCommentThreadModel.cs" />
     <Compile Include="Models\PullRequestSessionLiveFile.cs" />
     <Compile Include="Models\PullRequestSessionFile.cs" />
+    <Compile Include="Services\PullRequestStatusBarManager.cs" />
     <Compile Include="Tags\MouseEnterAndLeaveEventRouter.cs" />
     <Compile Include="Peek\InlineCommentPeekableItem.cs" />
     <Compile Include="Peek\InlineCommentPeekableItemSource.cs" />
@@ -124,6 +126,7 @@
     <Compile Include="ViewModels\IPullRequestCommentsViewModel.cs" />
     <Compile Include="ViewModels\IssueCommentThreadViewModel.cs" />
     <Compile Include="ViewModels\PullRequestCommentsViewModel.cs" />
+    <Compile Include="ViewModels\PullRequestStatusViewModel.cs" />
     <Compile Include="Views\DiffCommentThreadView.xaml.cs">
       <DependentUpon>DiffCommentThreadView.xaml</DependentUpon>
     </Compile>
@@ -161,6 +164,9 @@
     <Compile Include="Views\CommentView.xaml.cs">
       <DependentUpon>CommentView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\PullRequestStatusView.xaml.cs">
+      <DependentUpon>PullRequestStatusView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="VisualStudioExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -443,6 +449,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\PullRequestStatusView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Analyzer Include="..\..\packages\SerilogAnalyzer.0.12.0.0\analyzers\dotnet\cs\SerilogAnalyzer.dll" />

src/GitHub.InlineReviews/InlineReviewsPackage.cs

@@ -12,7 +12,7 @@ namespace GitHub.InlineReviews
     [Guid(Guids.InlineReviewsPackageId)]
     [ProvideAutoLoad(UIContextGuids80.SolutionExists)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
-    [ProvideToolWindow(typeof(PullRequestCommentsPane), DocumentLikeTool=true)]
+    [ProvideToolWindow(typeof(PullRequestCommentsPane), DocumentLikeTool = true)]
     public class InlineReviewsPackage : Package
     {
         protected override void Initialize()

src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+using GitHub.Services;
+using GitHub.VisualStudio;
+using GitHub.InlineReviews.Services;
+using Microsoft.VisualStudio.Shell;
+using Task = System.Threading.Tasks.Task;
+
+namespace GitHub.InlineReviews
+{
+    [Guid(Guids.PullRequestStatusPackageId)]
+    [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
+    [ProvideAutoLoad(Guids.GitSccProviderId, PackageAutoLoadFlags.BackgroundLoad)]
+    public class PullRequestStatusBarPackage : AsyncPackage
+    {
+        /// <summary>
+        /// Initialize the PR status UI on Visual Studio's status bar.
+        /// </summary>
+        protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
+        {
+            var usageTracker = (IUsageTracker)await GetServiceAsync(typeof(IUsageTracker));
+            var serviceProvider = (IGitHubServiceProvider)await GetServiceAsync(typeof(IGitHubServiceProvider));
+            var gitExt = (IVSGitExt)await GetServiceAsync(typeof(IVSGitExt));
+
+            new PullRequestStatusBarManager(gitExt, usageTracker, serviceProvider);
+        }
+    }
+}

src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs

@@ -0,0 +1,169 @@
+using System;
+using System.Windows;
+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;
+using GitHub.Services;
+using GitHub.VisualStudio;
+using GitHub.Models;
+using GitHub.Logging;
+using GitHub.Extensions;
+using Serilog;
+
+namespace GitHub.InlineReviews.Services
+{
+    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)
+        {
+            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()
+        {
+            try
+            {
+                // Create just in time on Main thread.
+                pullRequestSessionManager = serviceProvider.GetService<IPullRequestSessionManager>();
+
+                RefreshCurrentSession();
+                pullRequestSessionManager.PropertyChanged += PullRequestSessionManager_PropertyChanged;
+            }
+            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;
+            var viewModel = pullRequest != null ? CreatePullRequestStatusViewModel(pullRequest) : null;
+            ShowStatus(viewModel);
+        }
+
+        PullRequestStatusViewModel CreatePullRequestStatusViewModel(IPullRequestModel pullRequest)
+        {
+            var dte = serviceProvider.TryGetService<EnvDTE.DTE>();
+            var command = new RaisePullRequestCommand(dte, usageTracker);
+            var pullRequestStatusViewModel = new PullRequestStatusViewModel(command);
+            pullRequestStatusViewModel.Number = pullRequest.Number;
+            pullRequestStatusViewModel.Title = pullRequest.Title;
+            return pullRequestStatusViewModel;
+        }
+
+        void ShowStatus(PullRequestStatusViewModel pullRequestStatusViewModel = null)
+        {
+            var statusBar = FindSccStatusBar(Application.Current.MainWindow);
+            if (statusBar != null)
+            {
+                var githubStatusBar = Find<PullRequestStatusView>(statusBar);
+                if (githubStatusBar != null)
+                {
+                    // Replace to ensure status shows up.
+                    statusBar.Items.Remove(githubStatusBar);
+                }
+
+                if (pullRequestStatusViewModel != null)
+                {
+                    githubStatusBar = new PullRequestStatusView { DataContext = pullRequestStatusViewModel };
+                    statusBar.Items.Insert(0, githubStatusBar);
+                }
+            }
+        }
+
+        static T Find<T>(StatusBar statusBar)
+        {
+            foreach (var item in statusBar.Items)
+            {
+                if (item is T)
+                {
+                    return (T)item;
+                }
+            }
+
+            return default(T);
+        }
+
+        StatusBar FindSccStatusBar(Window mainWindow)
+        {
+            var contentControl = mainWindow?.Template?.FindName(StatusBarPartName, mainWindow) as ContentControl;
+            return contentControl?.Content as StatusBar;
+        }
+
+        class RaisePullRequestCommand : ICommand
+        {
+            readonly string guid = Guids.guidGitHubCmdSetString;
+            readonly int id = PkgCmdIDList.showCurrentPullRequestCommand;
+
+            readonly EnvDTE.DTE dte;
+            readonly IUsageTracker usageTracker;
+
+            internal RaisePullRequestCommand(EnvDTE.DTE dte, IUsageTracker usageTracker)
+            {
+                this.dte = dte;
+                this.usageTracker = usageTracker;
+            }
+
+            public bool CanExecute(object parameter) => true;
+
+            public void Execute(object parameter)
+            {
+                try
+                {
+                    object customIn = null;
+                    object customOut = null;
+                    dte?.Commands.Raise(guid, id, ref customIn, ref customOut);
+                }
+                catch (Exception e)
+                {
+                    log.Error(e, "Couldn't raise {Guid}:{ID}", guid, id);
+                }
+
+                usageTracker.IncrementCounter(x => x.NumberOfShowCurrentPullRequest).Forget();
+            }
+
+            public event EventHandler CanExecuteChanged
+            {
+                add { }
+                remove { }
+            }
+        }
+    }
+}