Merge branch 'master' into fixes/pr-list-errors-2

Author: jcansdale

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -405,6 +405,9 @@
       <HintPath>..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

@@ -434,23 +434,12 @@ public async Task<PullRequestDetailModel> CreatePendingReview(
         {
             var address = HostAddress.Create(localRepository.CloneUrl.Host);
             var graphql = await graphqlFactory.CreateConnection(address);
+            var (_, owner, number) = await CreatePendingReviewCore(localRepository, pullRequestId);
+            var detail = await ReadPullRequestDetail(address, owner, localRepository.Name, number);
 
-            var review = new AddPullRequestReviewInput
-            {
-                PullRequestId = new ID(pullRequestId),
-            };
-
-            var mutation = new Mutation()
-                .AddPullRequestReview(review)
-                .Select(x => new
-                {
-                    x.PullRequestReview.Repository.Owner.Login,
-                    x.PullRequestReview.PullRequest.Number
-                });
-
-            var result = await graphql.Run(mutation);
             await usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentStartReview);
-            return await ReadPullRequestDetail(address, result.Login, localRepository.Name, result.Number);
+
+            return detail;
         }
 
         /// <inheritdoc/>
@@ -652,9 +641,9 @@ public async Task<PullRequestDetailModel> PostStandaloneReviewCommentReply(
             string body,
             string inReplyTo)
         {
-            var review = await CreatePendingReview(localRepository, pullRequestId);
-            var comment = await PostPendingReviewCommentReply(localRepository, review.Id, body, inReplyTo);
-            return await SubmitPendingReview(localRepository, review.Id, null, PullRequestReviewEvent.Comment);
+            var (id, _, _) = await CreatePendingReviewCore(localRepository, pullRequestId);
+            var comment = await PostPendingReviewCommentReply(localRepository, id, body, inReplyTo);
+            return await SubmitPendingReview(localRepository, id, null, PullRequestReviewEvent.Comment);
         }
 
         /// <inheritdoc/>
@@ -702,6 +691,29 @@ public async Task<PullRequestDetailModel> EditComment(ILocalRepositoryModel loca
             return await ReadPullRequestDetail(address, result.Login, localRepository.Name, result.Number);
         }
 
+        async Task<(string id, string owner, int number)> CreatePendingReviewCore(ILocalRepositoryModel localRepository, string pullRequestId)
+        {
+            var address = HostAddress.Create(localRepository.CloneUrl.Host);
+            var graphql = await graphqlFactory.CreateConnection(address);
+
+            var input = new AddPullRequestReviewInput
+            {
+                PullRequestId = new ID(pullRequestId),
+            };
+
+            var mutation = new Mutation()
+                .AddPullRequestReview(input)
+                .Select(x => new
+                {
+                    Id = x.PullRequestReview.Id.Value,
+                    Owner = x.PullRequestReview.Repository.Owner.Login,
+                    x.PullRequestReview.PullRequest.Number
+                });
+
+            var result = await graphql.Run(mutation);
+            return (result.Id, result.Owner, result.Number);
+        }
+
         int GetUpdatedLineNumber(IInlineCommentThreadModel thread, IEnumerable<DiffChunk> diff)
         {
             var line = DiffUtilities.Match(diff, thread.DiffMatch);
@@ -724,7 +736,7 @@ Task<IRepository> GetRepository(ILocalRepositoryModel repository)
         static void BuildPullRequestThreads(PullRequestDetailModel model)
         {
             var commentsByReplyId = new Dictionary<string, List<CommentAdapter>>();
-
+           
             // Get all comments that are not replies.
             foreach (CommentAdapter comment in model.Reviews.SelectMany(x => x.Comments))
             {
@@ -744,7 +756,6 @@ static void BuildPullRequestThreads(PullRequestDetailModel model)
                     if (commentsByReplyId.TryGetValue(comment.ReplyTo, out thread))
                     {
                         thread.Add(comment);
-                        break;
                     }
                 }
             }

src/GitHub.InlineReviews/packages.config

@@ -42,6 +42,7 @@
   <package id="Rx-PlatformServices" version="2.2.5-custom" targetFramework="net461" />
   <package id="Serilog" version="2.5.0" targetFramework="net461" />
   <package id="SerilogAnalyzer" version="0.12.0.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
   <package id="VSSDK.ComponentModelHost" version="12.0.4" targetFramework="net461" />
   <package id="VSSDK.IDE.12" version="12.0.4" targetFramework="net461" />
 </packages>