Merge branch 'master' into fixes/github-fork-limit-functionality

jcansdale · web-flow · commit 392b3fe1e7b0 · 2018-05-17T15:22:52.000+01:00
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestReviewAuthoringViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestReviewAuthoringViewModel.cs
@@ -12,6 +12,7 @@
 using GitHub.Services;
 using ReactiveUI;
 using Serilog;
+using static System.FormattableString;
 
 namespace GitHub.ViewModels.GitHubPane
 {
@@ -71,6 +72,8 @@ public PullRequestReviewAuthoringViewModel(
                 hasBodyOrComments,
                 _ => DoSubmit(Octokit.PullRequestReviewEvent.RequestChanges));
             Cancel = ReactiveCommand.CreateAsyncTask(DoCancel);
+            NavigateToPullRequest = ReactiveCommand.Create().OnExecuteCompleted(_ =>
+                NavigateTo(Invariant($"{LocalRepository.Owner}/{LocalRepository.Name}/pull/{PullRequestModel.Number}")));
         }
 
         /// <inheritdoc/>
diff --git a/src/GitHub.Exports/Exports/ExportForProcessAttribute.cs b/src/GitHub.Exports/Exports/ExportForProcessAttribute.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.ComponentModel.Composition;
 
 namespace GitHub.Exports
@@ -11,24 +12,32 @@ namespace GitHub.Exports
     /// This attribute is used to mark exports that mustn't be loaded into Blend.
     /// See: https://github.com/github/VisualStudio/pull/1055
     /// </remarks>
+    [SuppressMessage("Microsoft.Performance", "CA1813:AvoidUnsealedAttributes", Justification = "Extended by ExportForVisualStudioProcessAttribute")]
     [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)]
-    public sealed class ExportForProcessAttribute : ExportAttribute
+    public class ExportForProcessAttribute : ExportAttribute
     {
+        // Unique name for exports that have been disabled
+        const string DisabledContractName = "GitHub.Disabled";
+
         /// <summary>
         /// Define an export that is only exposed in a specific named process.
         /// </summary>
-        /// <param name="contractType">The contract type to expose.</param>
         /// <param name="processName">Name of the process to expose export from (e.g. 'devenv').</param>
-        public ExportForProcessAttribute(Type contractType, string processName) : base(ExportForProcess(contractType, processName))
+        /// <param name="contractType">The contract type to expose.</param>
+        public ExportForProcessAttribute(string processName, Type contractType = null) :
+            base(ContractNameForProcess(processName), contractType)
         {
             ProcessName = processName;
         }
 
-        static Type ExportForProcess(Type contractType, string processName)
+        static string ContractNameForProcess(string processName)
         {
-            return Process.GetCurrentProcess().ProcessName == processName ? contractType : null;
+            var enabled = IsProcess(processName);
+            return enabled ? null : DisabledContractName;
         }
 
+        public static bool IsProcess(string processName) => Process.GetCurrentProcess().ProcessName == processName;
+
         /// <summary>
         /// The process name export will be exposed in.
         /// </summary>
diff --git a/src/GitHub.Exports/Exports/ExportForVisualStudioProcessAttribute.cs b/src/GitHub.Exports/Exports/ExportForVisualStudioProcessAttribute.cs
@@ -0,0 +1,28 @@
+﻿using System;
+
+namespace GitHub.Exports
+{
+    /// <summary>
+    /// Only expose export when executing in Visual Studio (devenv) process.
+    /// </summary>
+    /// <remarks>
+    /// This attribute is used to mark exports that mustn't be loaded into Blend.
+    /// See: https://github.com/github/VisualStudio/pull/1055
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)]
+    public sealed class ExportForVisualStudioProcessAttribute : ExportForProcessAttribute
+    {
+        const string VisualStudioProcessName = "devenv";
+
+        /// <summary>
+        /// Define an export that is only exposed in a Visual Studio (devenv) process.
+        /// </summary>
+        /// <param name="contractType">The contract type to expose.</param>
+        public ExportForVisualStudioProcessAttribute(Type contractType = null) :
+            base(VisualStudioProcessName, contractType)
+        {
+        }
+
+        public static bool IsVisualStudioProcess() => IsProcess(VisualStudioProcessName);
+    }
+}
diff --git a/src/GitHub.Exports/GitHub.Exports.csproj b/src/GitHub.Exports/GitHub.Exports.csproj
@@ -159,7 +159,8 @@
     <Compile Include="Commands\IGoToSolutionOrPullRequestFileCommand.cs" />
     <Compile Include="Commands\IVsCommand.cs" />
     <Compile Include="Commands\IVsCommandBase.cs" />
-    <Compile Include="Exports\ExportForProcess.cs" />
+    <Compile Include="Exports\ExportForVisualStudioProcessAttribute.cs" />
+    <Compile Include="Exports\ExportForProcessAttribute.cs" />
     <Compile Include="Extensions\ConnectionManagerExtensions.cs" />
     <Compile Include="GitHubLogicException.cs" />
     <Compile Include="Models\CommitMessage.cs" />
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.cs b/src/GitHub.InlineReviews/InlineReviewsPackage.cs
@@ -2,12 +2,15 @@
 using System.ComponentModel.Design;
 using System.Runtime.InteropServices;
 using System.Threading;
+using GitHub.Exports;
+using GitHub.Logging;
 using GitHub.Commands;
 using GitHub.Services.Vssdk.Commands;
 using GitHub.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
+using Serilog;
 using Task = System.Threading.Tasks.Task;
 
 namespace GitHub.InlineReviews
@@ -18,6 +21,8 @@ namespace GitHub.InlineReviews
     [ProvideMenuResource("Menus.ctmenu", 1)]
     public class InlineReviewsPackage : AsyncPackage
     {
+        static readonly ILogger log = LogManager.ForContext<InlineReviewsPackage>();
+
         protected override async Task InitializeAsync(
             CancellationToken cancellationToken,
             IProgress<ServiceProgressData> progress)
@@ -33,6 +38,12 @@ protected override async Task InitializeAsync(
 
         async Task InitializeMenus()
         {
+            if (!ExportForVisualStudioProcessAttribute.IsVisualStudioProcess())
+            {
+                log.Warning("Don't initialize menus for non-Visual Studio process");
+                return;
+            }
+
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
             var commands = new IVsCommandBase[]
diff --git a/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs b/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs
@@ -5,7 +5,10 @@
 using System.Windows.Controls.Primitives;
 using System.ComponentModel.Composition;
 using System.Reactive.Linq;
+using System.Threading.Tasks;
 using GitHub.Commands;
+using GitHub.Extensions;
+using GitHub.Primitives;
 using GitHub.InlineReviews.Views;
 using GitHub.InlineReviews.ViewModels;
 using GitHub.Services;
@@ -32,6 +35,7 @@ public class PullRequestStatusBarManager
         // TeamExplorerContext needs to retrieve DTE using GetService.
         readonly Lazy<IPullRequestSessionManager> pullRequestSessionManager;
         readonly Lazy<ITeamExplorerContext> teamExplorerContext;
+        readonly Lazy<IConnectionManager> connectionManager;
 
         IDisposable currentSessionSubscription;
 
@@ -41,7 +45,8 @@ public PullRequestStatusBarManager(
             IOpenPullRequestsCommand openPullRequestsCommand,
             IShowCurrentPullRequestCommand showCurrentPullRequestCommand,
             Lazy<IPullRequestSessionManager> pullRequestSessionManager,
-            Lazy<ITeamExplorerContext> teamExplorerContext)
+            Lazy<ITeamExplorerContext> teamExplorerContext,
+            Lazy<IConnectionManager> connectionManager)
         {
             this.openPullRequestsCommand = new UsageTrackingCommand(usageTracker,
                 x => x.NumberOfStatusBarOpenPullRequestList, openPullRequestsCommand);
@@ -50,6 +55,7 @@ public PullRequestStatusBarManager(
 
             this.pullRequestSessionManager = pullRequestSessionManager;
             this.teamExplorerContext = teamExplorerContext;
+            this.connectionManager = connectionManager;
         }
 
         /// <summary>
@@ -76,24 +82,55 @@ void RefreshActiveRepository(ILocalRepositoryModel repository)
         {
             currentSessionSubscription?.Dispose();
             currentSessionSubscription = pullRequestSessionManager.Value.WhenAnyValue(x => x.CurrentSession)
-                .Subscribe(x => RefreshCurrentSession(repository, x));
+                .Subscribe(x => RefreshCurrentSession(repository, x).Forget());
         }
 
-        void RefreshCurrentSession(ILocalRepositoryModel repository, IPullRequestSession session)
+        async Task RefreshCurrentSession(ILocalRepositoryModel repository, IPullRequestSession session)
         {
-            var cloneUrl = repository?.CloneUrl;
-            if (cloneUrl != null)
+            try
             {
-                // Only show PR status bar if repo has remote
+                var showStatus = await IsDotComOrEnterpriseRepository(repository);
+                if (!showStatus)
+                {
+                    ShowStatus(null);
+                    return;
+                }
+
                 var viewModel = CreatePullRequestStatusViewModel(session);
                 ShowStatus(viewModel);
             }
-            else
+            catch (Exception e)
             {
-                ShowStatus(null);
+                log.Error(e, nameof(RefreshCurrentSession));
             }
         }
 
+        async Task<bool> IsDotComOrEnterpriseRepository(ILocalRepositoryModel repository)
+        {
+            var cloneUrl = repository?.CloneUrl;
+            if (cloneUrl == null)
+            {
+                // No active repository or remote
+                return false;
+            }
+
+            var isDotCom = HostAddress.IsGitHubDotComUri(cloneUrl.ToRepositoryUrl());
+            if (isDotCom)
+            {
+                // This is a github.com repository
+                return true;
+            }
+
+            var connection = await connectionManager.Value.GetConnection(repository);
+            if (connection != null)
+            {
+                // This is an enterprise repository
+                return true;
+            }
+
+            return false;
+        }
+
         PullRequestStatusViewModel CreatePullRequestStatusViewModel(IPullRequestSession session)
         {
             var pullRequestStatusViewModel = new PullRequestStatusViewModel(openPullRequestsCommand, showCurrentPullRequestCommand);
diff --git a/src/GitHub.InlineReviews/Views/PullRequestStatusView.xaml b/src/GitHub.InlineReviews/Views/PullRequestStatusView.xaml
@@ -49,14 +49,11 @@
                         VerticalAlignment="Bottom"
                         Margin="0 0 4 0 "
                         Icon="git_pull_request" />
-                    <TextBlock VerticalAlignment="Center">
-                        Pull requests
-                    </TextBlock>
                 </StackPanel>
             </Button>
             <Grid.ToolTip>
                 <TextBlock VerticalAlignment="Center">
-                    Open or Create a Pull request
+                    View, Checkout or Create a Pull request
                 </TextBlock>
             </Grid.ToolTip>
         </Grid>
diff --git a/src/GitHub.TeamFoundation.14/Base/TeamExplorerServiceHolder.cs b/src/GitHub.TeamFoundation.14/Base/TeamExplorerServiceHolder.cs
@@ -138,7 +138,7 @@ void NotifyActiveRepo()
 
         void UpdateActiveRepo()
         {
-            // NOTE: gitService will be null in Expression Blend or Safe Mode
+            // NOTE: gitService might be null in Blend or Safe Mode
             var repo = gitService?.ActiveRepositories.FirstOrDefault();
 
             if (!Equals(repo, ActiveRepo))
diff --git a/src/GitHub.VisualStudio.UI/Resources.Designer.cs b/src/GitHub.VisualStudio.UI/Resources.Designer.cs
diff --git a/src/GitHub.VisualStudio.UI/Resources.resx b/src/GitHub.VisualStudio.UI/Resources.resx
@@ -425,6 +425,9 @@
   <data name="Options_EnableTraceLoggingText" xml:space="preserve">
     <value>Enable Trace Logging</value>
   </data>
+  <data name="BlendDialogText" xml:space="preserve">
+    <value>The GitHub extension is not available inside Blend</value>
+  </data>
   <data name="Options_ForkButtonLabel" xml:space="preserve">
     <value>Show Fork button in Team Explorer</value>
   </data>
diff --git a/src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs b/src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs
@@ -150,14 +150,6 @@ void OnBeforeQueryStatus(object sender, EventArgs e)
         {
             try
             {
-                var session = sessionManager.Value.CurrentSession;
-                if (session == null)
-                {
-                    // No active pull request session
-                    Visible = false;
-                    return;
-                }
-
                 var sourceView = pullRequestEditorService.Value.FindActiveView();
                 if (sourceView == null)
                 {
@@ -185,13 +177,17 @@ void OnBeforeQueryStatus(object sender, EventArgs e)
                     return;
                 }
 
-                var relativePath = sessionManager.Value.GetRelativePath(textView.TextBuffer);
-                if (relativePath != null)
+                var session = sessionManager.Value.CurrentSession;
+                if (session != null)
                 {
-                    // Active text view is part of a repository
-                    Text = "View Changes in #" + session.PullRequest.Number;
-                    Visible = true;
-                    return;
+                    var relativePath = sessionManager.Value.GetRelativePath(textView.TextBuffer);
+                    if (relativePath != null)
+                    {
+                        // Active text view is part of a repository
+                        Text = "View Changes in #" + session.PullRequest.Number;
+                        Visible = true;
+                        return;
+                    }
                 }
             }
             catch (Exception ex)
diff --git a/src/GitHub.VisualStudio/Commands/ShowMessageBoxCommand.cs b/src/GitHub.VisualStudio/Commands/ShowMessageBoxCommand.cs
@@ -0,0 +1,37 @@
+﻿using System;
+using GitHub.Services.Vssdk.Commands;
+using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using Task = System.Threading.Tasks.Task;
+
+namespace GitHub.VisualStudio.Commands
+{
+    /// <summary>
+    /// Show an info message dialog when a command is executed.
+    /// </summary>
+    public class ShowMessageBoxCommand : VsCommand
+    {
+        readonly IServiceProvider serviceProvider;
+        readonly string message;
+
+        public ShowMessageBoxCommand(Guid commandSet, int commandId,
+            IServiceProvider serviceProvider, string message) : base(commandSet, commandId)
+        {
+            this.serviceProvider = serviceProvider;
+            this.message = message;
+        }
+
+        public override Task Execute()
+        {
+            ShowInfoMessage(message);
+            return Task.CompletedTask;
+        }
+
+        void ShowInfoMessage(string infoMessage)
+        {
+            ErrorHandler.ThrowOnFailure(VsShellUtilities.ShowMessageBox(serviceProvider, infoMessage, null,
+                OLEMSGICON.OLEMSGICON_INFO, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST));
+        }
+    }
+}
diff --git a/src/GitHub.VisualStudio/GitContextPackage.cs b/src/GitHub.VisualStudio/GitContextPackage.cs
@@ -1,8 +1,11 @@
 ﻿using System;
 using System.Threading;
 using System.Runtime.InteropServices;
-using Microsoft.VisualStudio.Shell;
+using GitHub.Exports;
+using GitHub.Logging;
 using GitHub.Services;
+using Microsoft.VisualStudio.Shell;
+using Serilog;
 using Task = System.Threading.Tasks.Task;
 
 namespace GitHub.VisualStudio
@@ -17,8 +20,16 @@ namespace GitHub.VisualStudio
     [ProvideAutoLoad(Guids.GitSccProviderId, PackageAutoLoadFlags.BackgroundLoad)]
     public class GitContextPackage : AsyncPackage
     {
+        static readonly ILogger log = LogManager.ForContext<GitContextPackage>();
+
         protected async override Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
+            if (!ExportForVisualStudioProcessAttribute.IsVisualStudioProcess())
+            {
+                log.Warning("Don't activate 'UIContext_Git' for non-Visual Studio process");
+                return;
+            }
+
             var gitExt = (IVSGitExt)await GetServiceAsync(typeof(IVSGitExt));
             var context = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));
             RefreshContext(context, gitExt);
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
diff --git a/src/GitHub.VisualStudio/Services/UsageService.cs b/src/GitHub.VisualStudio/Services/UsageService.cs
diff --git a/src/GitHub.VisualStudio/Settings/OptionsPage.cs b/src/GitHub.VisualStudio/Settings/OptionsPage.cs

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using GitHub.Services;`
`13`	`13`	`using ReactiveUI;`
`14`	`14`	`using Serilog;`
	`15`	`+using static System.FormattableString;`
`15`	`16`
`16`	`17`	`namespace GitHub.ViewModels.GitHubPane`
`17`	`18`	`{`
`@@ -71,6 +72,8 @@ public PullRequestReviewAuthoringViewModel(`
`71`	`72`	`hasBodyOrComments,`
`72`	`73`	`_ => DoSubmit(Octokit.PullRequestReviewEvent.RequestChanges));`
`73`	`74`	`Cancel = ReactiveCommand.CreateAsyncTask(DoCancel);`
	`75`	`+ NavigateToPullRequest = ReactiveCommand.Create().OnExecuteCompleted(_ =>`
	`76`	`+ NavigateTo(Invariant($"{LocalRepository.Owner}/{LocalRepository.Name}/pull/{PullRequestModel.Number}")));`
`74`	`77`	`}`
`75`	`78`
`76`	`79`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ void NotifyActiveRepo()`
`138`	`138`
`139`	`139`	`void UpdateActiveRepo()`
`140`	`140`	`{`
`141`		`- // NOTE: gitService will be null in Expression Blend or Safe Mode`
	`141`	`+ // NOTE: gitService might be null in Blend or Safe Mode`
`142`	`142`	`var repo = gitService?.ActiveRepositories.FirstOrDefault();`
`143`	`143`
`144`	`144`	`if (!Equals(repo, ActiveRepo))`