Merge branch 'master' into fixes/pull-request-is-from-repository

Author: StanleyGoldman

CONTRIBUTING.md

@@ -13,16 +13,16 @@ This project adheres to the [Open Code of Conduct][code-of-conduct]. By particip
 
 ## Submitting a pull request
 
-0. [Fork][] and clone the repository (see Build Instructions in the [README][readme])
-0. Create a new branch: `git checkout -b my-branch-name`
-0. Make your change, add tests, and make sure the tests still pass
-0. Push to your fork and [submit a pull request][pr]
-0. Pat your self on the back and wait for your pull request to be reviewed and merged.
+1. [Fork][] and clone the repository (see Build Instructions in the [README][readme])
+2. Create a new branch: `git checkout -b my-branch-name`
+3. Make your change, add tests, and make sure the tests still pass
+4. Push to your fork and [submit a pull request][pr]
+5. Pat your self on the back and wait for your pull request to be reviewed and merged.
 
 Here are a few things you can do that will increase the likelihood of your pull request being accepted:
 
-- Follow the existing code's style.
-- Write tests.
+- Follow the style/format of the existing code.
+- Write tests for your changes.
 - Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
 - Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 
@@ -38,7 +38,7 @@ There are certain areas of the extension that are restricted in what they can do
 ### Bug Reporting
 
 Here are a few helpful tips when reporting a bug:
-- Verify the bug resides in the GitHub for Visual Studio extension
+- Verify that the bug resides in the GitHub for Visual Studio extension
   - A lot of functionality provided by this extension resides in the Team Explorer pane, alongside other non-GitHub tools to manage and collaborate on source code, including Visual Studio's Git support, which is owned by Microsoft.
   - If this bug not is related to the GitHub extension, visit the [Visual Studio support page](https://www.visualstudio.com/support/support-overview-vs) for help
 - Screenshots are very helpful in diagnosing bugs and understanding the state of the extension when it's experiencing problems. Please include them whenever possible.

appveyor.yml

@@ -1,5 +1,5 @@
 os: Visual Studio 2017
-version: '2.5.4.{build}'
+version: '2.5.5.{build}'
 skip_tags: true
 install:
 - ps: |

src/GitHub.App/Services/GitHubContextService.cs

@@ -58,6 +58,8 @@ public class GitHubContextService : IGitHubContextService
         static readonly Regex treeishCommitRegex = new Regex($"(?<commit>[a-z0-9]{{40}})(/(?<tree>.+))?", RegexOptions.Compiled);
         static readonly Regex treeishBranchRegex = new Regex($"(?<branch>master)(/(?<tree>.+))?", RegexOptions.Compiled);
 
+        static readonly Regex tempFileObjectishRegex = new Regex(@"\\TFSTemp\\[^\\]*[.](?<objectish>[a-z0-9]{8})[.][^.\\]*$", RegexOptions.Compiled);
+
         [ImportingConstructor]
         public GitHubContextService(IGitHubServiceProvider serviceProvider, IGitService gitService)
         {
@@ -305,6 +307,55 @@ public bool TryOpenFile(string repositoryDir, GitHubContext context)
             }
         }
 
+        /// <inheritdoc/>
+        public string FindObjectishForTFSTempFile(string tempFile)
+        {
+            var match = tempFileObjectishRegex.Match(tempFile);
+            if (match.Success)
+            {
+                return match.Groups["objectish"].Value;
+            }
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+        public (string commitSha, string blobPath) ResolveBlobFromHistory(string repositoryDir, string objectish)
+        {
+            using (var repo = gitService.GetRepository(repositoryDir))
+            {
+                var blob = repo.Lookup<Blob>(objectish);
+                if (blob == null)
+                {
+                    return (null, null);
+                }
+
+                foreach (var commit in repo.Commits)
+                {
+                    var trees = new Stack<Tree>();
+                    trees.Push(commit.Tree);
+
+                    while (trees.Count > 0)
+                    {
+                        foreach (var treeEntry in trees.Pop())
+                        {
+                            if (treeEntry.Target == blob)
+                            {
+                                return (commit.Sha, treeEntry.Path);
+                            }
+
+                            if (treeEntry.TargetType == TreeEntryTargetType.Tree)
+                            {
+                                trees.Push((Tree)treeEntry.Target);
+                            }
+                        }
+                    }
+                }
+
+                return (null, null);
+            }
+        }
+
         /// <inheritdoc/>
         public bool HasChangesInWorkingDirectory(string repositoryDir, string commitish, string path)
         {

src/GitHub.App/ViewModels/Dialog/LoginToGitHubForEnterpriseViewModel.cs

@@ -65,7 +65,7 @@ public LoginToGitHubForEnterpriseViewModel(
             this.WhenAnyValue(x => x.EnterpriseUrl, x => x.EnterpriseUrlValidator.ValidationResult)
                 .Throttle(TimeSpan.FromMilliseconds(500), scheduler)
                 .ObserveOn(RxApp.MainThreadScheduler)
-                .Subscribe(x => EnterpriseUrlChanged(x.Item1, x.Item2?.IsValid ?? false));
+                .Subscribe(x => UpdatingProbeStatus = EnterpriseUrlChanged(x.Item1, x.Item2?.IsValid ?? false));
 
             NavigateLearnMore = ReactiveCommand.CreateAsyncObservable(_ =>
             {
@@ -122,13 +122,19 @@ public IReactiveCommand<Unit> NavigateLearnMore
             get;
         }
 
+        public Task UpdatingProbeStatus
+        {
+            get;
+            private set;
+        }
+
         protected override async Task ResetValidation()
         {
             EnterpriseUrl = null;
             await EnterpriseUrlValidator.ResetAsync();
         }
 
-        async void EnterpriseUrlChanged(string url, bool valid)
+        async Task EnterpriseUrlChanged(string url, bool valid)
         {
             if (!valid)
             {

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

@@ -246,10 +246,7 @@ void FilterChanged()
             {
                 numberFilter = 0;
 
-                if (SearchQuery.StartsWith('#'))
-                {
-                    int.TryParse(SearchQuery.Substring(1), out numberFilter);
-                }
+                int.TryParse(SearchQuery.Substring(SearchQuery.StartsWith('#') ? 1 : 0), out numberFilter);
 
                 if (numberFilter == 0)
                 {

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

@@ -41,7 +41,7 @@ public static IEnumerable<PullRequestReviewSummaryViewModel> BuildByUser(
         {
             var existing = new Dictionary<string, PullRequestReviewSummaryViewModel>();
 
-            foreach (var review in pullRequest.Reviews.OrderBy(x => x.Id))
+            foreach (var review in pullRequest.Reviews.OrderBy(x => x.SubmittedAt))
             {
                 if (review.State == PullRequestReviewState.Pending && review.Author.Login != currentUser.Login)
                     continue;

src/GitHub.Exports/Services/IGitHubContextService.cs

@@ -71,6 +71,30 @@ public interface IGitHubContextService
         /// <returns>The resolved commit-ish, blob path and commit SHA for the blob. Path will be null if the commit-ish can be resolved but not the blob.</returns>
         (string commitish, string path, string commitSha) ResolveBlob(string repositoryDir, GitHubContext context, string remoteName = "origin");
 
+        /// <summary>
+        /// Find the object-ish (first 8 chars of a blob SHA) from the path to historical blob created by Team Explorer.
+        /// </summary>
+        /// <remarks>
+        /// Team Explorer creates temporary blob files in the following format:
+        /// C:\Users\me\AppData\Local\Temp\TFSTemp\vctmp21996_181282.IOpenFromClipboardCommand.783ac965.cs
+        /// The object-ish appears immediately before the file extension and the path contains the folder "TFSTemp".
+        /// <remarks>
+        /// <param name="tempFile">The path to a possible Team Explorer temporary blob file.</param>
+        /// <returns>The target file's object-ish (blob SHA fragment) or null if the path isn't recognized as a Team Explorer blob file.</returns>
+        string FindObjectishForTFSTempFile(string tempFile);
+
+        /// <summary>
+        /// Find a tree entry in the commit log where a blob appears and return its commit SHA and path.
+        /// </summary>
+        /// <remarks>
+        /// Search back through the commit log for the first tree entry where a blob appears. This operation only takes
+        /// a fraction of a seond on the `github/VisualStudio` repository even if a tree entry casn't be found.
+        /// </remarks>
+        /// <param name="repositoryDir">The target repository directory.</param>
+        /// <param name="objectish">The fragment of a blob SHA to find.</param>
+        /// <returns>The commit SHA and blob path or null if the blob can't be found.</returns>
+        (string commitSha, string blobPath) ResolveBlobFromHistory(string repositoryDir, string objectish);
+
         /// <summary>
         /// Check if a file in the working directory has changed since a specified commit-ish.
         /// </summary>

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -84,6 +84,8 @@
     <Compile Include="Margins\InlineCommentMargin.cs" />
     <Compile Include="Margins\InlineCommentMarginVisible.cs" />
     <Compile Include="Margins\InlineCommentMarginEnabled.cs" />
+    <Compile Include="Services\CommentService.cs" />
+    <Compile Include="Services\ICommentService.cs" />
     <Compile Include="PullRequestStatusBarPackage.cs" />
     <Compile Include="InlineReviewsPackage.cs" />
     <Compile Include="Models\InlineCommentThreadModel.cs" />

src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs

@@ -1,11 +1,13 @@
 using System;
 using System.ComponentModel.Composition;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Utilities;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
 using Microsoft.VisualStudio.Text.Classification;
-using GitHub.InlineReviews.Services;
 using GitHub.Services;
+using GitHub.VisualStudio;
+using GitHub.InlineReviews.Services;
 
 namespace GitHub.InlineReviews.Margins
 {
@@ -17,28 +19,41 @@ namespace GitHub.InlineReviews.Margins
     [TextViewRole(PredefinedTextViewRoles.Interactive)]
     internal sealed class InlineCommentMarginProvider : IWpfTextViewMarginProvider
     {
-        readonly IEditorFormatMapService editorFormatMapService;
-        readonly IViewTagAggregatorFactoryService tagAggregatorFactory;
-        readonly IInlineCommentPeekService peekService;
+        readonly Lazy<IEditorFormatMapService> editorFormatMapService;
+        readonly Lazy<IViewTagAggregatorFactoryService> tagAggregatorFactory;
+        readonly Lazy<IInlineCommentPeekService> peekService;
         readonly Lazy<IPullRequestSessionManager> sessionManager;
+        readonly UIContext uiContext;
 
         [ImportingConstructor]
         public InlineCommentMarginProvider(
-            IGitHubServiceProvider serviceProvider,
-            IEditorFormatMapService editorFormatMapService,
-            IViewTagAggregatorFactoryService tagAggregatorFactory,
-            IInlineCommentPeekService peekService)
+            Lazy<IPullRequestSessionManager> sessionManager,
+            Lazy<IEditorFormatMapService> editorFormatMapService,
+            Lazy<IViewTagAggregatorFactoryService> tagAggregatorFactory,
+            Lazy<IInlineCommentPeekService> peekService)
         {
+            this.sessionManager = sessionManager;
             this.editorFormatMapService = editorFormatMapService;
             this.tagAggregatorFactory = tagAggregatorFactory;
             this.peekService = peekService;
-            sessionManager = new Lazy<IPullRequestSessionManager>(() => serviceProvider.GetService<IPullRequestSessionManager>());
+
+            uiContext = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));
         }
 
         public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent)
         {
+            if (!uiContext.IsActive)
+            {
+                // Only create margin when in the context of a Git repository
+                return null;
+            }
+
             return new InlineCommentMargin(
-                wpfTextViewHost, peekService, editorFormatMapService, tagAggregatorFactory, sessionManager);
+                wpfTextViewHost,
+                peekService.Value,
+                editorFormatMapService.Value,
+                tagAggregatorFactory.Value,
+                sessionManager);
         }
     }
 }

src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs

@@ -3,6 +3,8 @@
 using GitHub.Commands;
 using GitHub.Services;
 using GitHub.Settings;
+using GitHub.VisualStudio;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Utilities;
 using Microsoft.VisualStudio.Text.Editor;
 
@@ -19,25 +21,28 @@ namespace GitHub.InlineReviews.Margins
     [TextViewRole(PredefinedTextViewRoles.Editable)]
     internal sealed class PullRequestFileMarginProvider : IWpfTextViewMarginProvider
     {
-        readonly IPullRequestSessionManager sessionManager;
-        readonly IToggleInlineCommentMarginCommand enableInlineCommentsCommand;
-        readonly IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand;
-        readonly IPackageSettings packageSettings;
+        readonly Lazy<IPullRequestSessionManager> sessionManager;
+        readonly Lazy<IToggleInlineCommentMarginCommand> enableInlineCommentsCommand;
+        readonly Lazy<IGoToSolutionOrPullRequestFileCommand> goToSolutionOrPullRequestFileCommand;
+        readonly Lazy<IPackageSettings> packageSettings;
         readonly Lazy<IUsageTracker> usageTracker;
+        readonly UIContext uiContext;
 
         [ImportingConstructor]
         public PullRequestFileMarginProvider(
-            IToggleInlineCommentMarginCommand enableInlineCommentsCommand,
-            IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand,
-            IPullRequestSessionManager sessionManager,
-            IPackageSettings packageSettings,
+            Lazy<IToggleInlineCommentMarginCommand> enableInlineCommentsCommand,
+            Lazy<IGoToSolutionOrPullRequestFileCommand> goToSolutionOrPullRequestFileCommand,
+            Lazy<IPullRequestSessionManager> sessionManager,
+            Lazy<IPackageSettings> packageSettings,
             Lazy<IUsageTracker> usageTracker)
         {
             this.enableInlineCommentsCommand = enableInlineCommentsCommand;
             this.goToSolutionOrPullRequestFileCommand = goToSolutionOrPullRequestFileCommand;
             this.sessionManager = sessionManager;
             this.packageSettings = packageSettings;
             this.usageTracker = usageTracker;
+
+            uiContext = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));
         }
 
         /// <summary>
@@ -50,8 +55,14 @@ public PullRequestFileMarginProvider(
         /// </returns>
         public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin marginContainer)
         {
+            if (!uiContext.IsActive)
+            {
+                // Only create margin when in the context of a Git repository
+                return null;
+            }
+
             // Comments in the editor feature flag
-            if (!packageSettings.EditorComments)
+            if (!packageSettings.Value.EditorComments)
             {
                 return null;
             }
@@ -63,7 +74,11 @@ public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTex
             }
 
             return new PullRequestFileMargin(
-                wpfTextViewHost.TextView, enableInlineCommentsCommand, goToSolutionOrPullRequestFileCommand, sessionManager, usageTracker);
+                wpfTextViewHost.TextView,
+                enableInlineCommentsCommand.Value,
+                goToSolutionOrPullRequestFileCommand.Value,
+                sessionManager.Value,
+                usageTracker);
         }
 
         bool IsDiffView(ITextView textView) => textView.Roles.Contains("DIFF");