Merge branch 'features/check-suite-annotations' into features/check-suite-annotations-inline

# Conflicts:
#	src/GitHub.App/SampleData/PullRequestAnnotationItemViewModelDesigner.cs
#	src/GitHub.App/ViewModels/GitHubPane/PullRequestAnnotationItemViewModel.cs
#	src/GitHub.App/ViewModels/GitHubPane/PullRequestAnnotationsViewModel.cs

Author: StanleyGoldman

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

@@ -22,24 +22,27 @@ public class PullRequestAnnotationItemViewModel : ViewModelBase, IPullRequestAnn
         /// <summary>
         /// Initializes the <see cref="PullRequestAnnotationItemViewModel"/>.
         /// </summary>
+        /// <param name="annotation">The check run annotation model.</param>
+        /// <param name="isFileInPullRequest">A flag that denotes if the annotation is part of the pull request's changes.</param>
         /// <param name="checkSuite">The check suite model.</param>
         /// <param name="checkRun">The check run model.</param>
         /// <param name="annotation">The check run annotation model.</param>
         /// <param name="session">The pull request session.</param>
         /// <param name="editorService">The pull request editor service.</param>
-        public PullRequestAnnotationItemViewModel(CheckSuiteModel checkSuite, 
+        public PullRequestAnnotationItemViewModel(
+            CheckRunAnnotationModel annotation, 
+            bool isFileInPullRequest,
             CheckRunModel checkRun,
-            CheckRunAnnotationModel annotation,
+            CheckSuiteModel checkSuite, 
             IPullRequestSession session,
             IPullRequestEditorService editorService)
         {
             this.checkSuite = checkSuite;
             this.checkRun = checkRun;
             this.session = session;
             this.editorService = editorService;
-            this.Annotation = annotation;
-
-            IsFileInPullRequest = session.PullRequest.ChangedFiles.Any(model => model.FileName == annotation.Path);
+            Annotation = annotation;
+            IsFileInPullRequest = isFileInPullRequest;
 
             OpenAnnotation = ReactiveCommand.CreateFromTask<Unit>(
                 async _ => await editorService.OpenDiff(session, annotation.Path, checkSuite.HeadSha, annotation.EndLine - 1),

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

@@ -127,12 +127,20 @@ void Load(PullRequestDetailModel pullRequest)
                 CheckSuiteName = checkSuiteRun.checkSuite.ApplicationName;
                 CheckRunName = checkSuiteRun.checkRun.Name;
 
-                AnnotationsDictionary = checkSuiteRun.checkRun.Annotations
-                    .GroupBy(annotation => annotation.Path)
+//                            .Select(annotation => new PullRequestAnnotationItemViewModel(checkSuiteRun.checkSuite, checkSuiteRun.checkRun, annotation, session, pullRequestEditorService))
+
+                var changedFiles = new HashSet<string>(session.PullRequest.ChangedFiles.Select(model => model.FileName));
+
+                var annotationsLookup = checkSuiteRun.checkRun.Annotations
+                    .ToLookup(annotation => annotation.Path);
+
+                AnnotationsDictionary = annotationsLookup
+                    .Select(models => models.Key)
+                    .OrderBy(s => s)
                     .ToDictionary(
-                        grouping => grouping.Key,
-                        grouping => grouping
-                            .Select(annotation => new PullRequestAnnotationItemViewModel(checkSuiteRun.checkSuite, checkSuiteRun.checkRun, annotation, session, pullRequestEditorService))
+                        path => path,
+                        path => annotationsLookup[path]
+                            .Select(annotation => new PullRequestAnnotationItemViewModel(annotation, changedFiles.Contains(path)))
                             .Cast<IPullRequestAnnotationItemViewModel>()
                             .ToArray()
                         );
@@ -142,6 +150,5 @@ void Load(PullRequestDetailModel pullRequest)
                 IsBusy = false;
             }
         }
-
     }
 }

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

@@ -8,7 +8,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using GitHub.Api;
-using GitHub.App.Services;
 using GitHub.Factories;
 using GitHub.InlineReviews.Models;
 using GitHub.Models;
@@ -18,22 +17,15 @@
 using LibGit2Sharp;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Projection;
-using Octokit;
 using Octokit.GraphQL;
-using Octokit.GraphQL.Core;
 using Octokit.GraphQL.Model;
 using ReactiveUI;
 using Serilog;
 using PullRequestReviewEvent = Octokit.PullRequestReviewEvent;
 using static Octokit.GraphQL.Variable;
-using CheckAnnotationLevel = GitHub.Models.CheckAnnotationLevel;
-using CheckConclusionState = GitHub.Models.CheckConclusionState;
-using CheckStatusState = GitHub.Models.CheckStatusState;
 using DraftPullRequestReviewComment = Octokit.GraphQL.Model.DraftPullRequestReviewComment;
 using FileMode = System.IO.FileMode;
 using NotFoundException = LibGit2Sharp.NotFoundException;
-using PullRequestReviewState = Octokit.GraphQL.Model.PullRequestReviewState;
-using StatusState = GitHub.Models.StatusState;
 
 // GraphQL DatabaseId field are marked as deprecated, but we need them for interop with REST.
 #pragma warning disable CS0618