Identifying what files are contained in the pull request

Author: StanleyGoldman

src/GitHub.App/SampleData/PullRequestAnnotationItemViewModelDesigner.cs

@@ -1,6 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Reactive;
 using GitHub.Models;
 using GitHub.ViewModels.GitHubPane;
+using ReactiveUI;
 
 namespace GitHub.SampleData
 {
@@ -10,5 +12,7 @@ public sealed class PullRequestAnnotationItemViewModelDesigner : IPullRequestAnn
         public CheckRunAnnotationModel Annotation { get; set; }
         public bool IsExpanded { get; set; }
         public string LineDescription => $"{Annotation.StartLine}:{Annotation.EndLine}";
+        public bool IsFileInPullRequest { get; }
+        public ReactiveCommand<Unit, Unit> OpenAnnotation { get; }
     }
 }

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

@@ -1,4 +1,8 @@
-using GitHub.Models;
+using System.Linq;
+using System.Reactive;
+using System.Reactive.Linq;
+using GitHub.Models;
+using GitHub.Services;
 using GitHub.ViewModels;
 using GitHub.ViewModels.GitHubPane;
 using ReactiveUI;
@@ -14,17 +18,27 @@ public class PullRequestAnnotationItemViewModel : ViewModelBase, IPullRequestAnn
         /// Initializes the <see cref="PullRequestAnnotationItemViewModel"/>.
         /// </summary>
         /// <param name="annotation">The check run annotation model.</param>
-        public PullRequestAnnotationItemViewModel(CheckRunAnnotationModel annotation)
+        /// <param name="isFileInPullRequest">A flag that denotes if the annotation is part of the pull request's changes.</param>
+        public PullRequestAnnotationItemViewModel(CheckRunAnnotationModel annotation, bool isFileInPullRequest)
         {
-            this.Annotation = annotation;
+            Annotation = annotation;
+            IsFileInPullRequest = isFileInPullRequest;
+
+            OpenAnnotation = ReactiveCommand.Create(() => { });
         }
 
+        /// <inheritdoc />
+        public bool IsFileInPullRequest { get; }
+
         /// <inheritdoc />
         public CheckRunAnnotationModel Annotation { get; }
 
         /// <inheritdoc />
         public string LineDescription => $"{Annotation.StartLine}:{Annotation.EndLine}";
 
+        /// <inheritdoc />
+        public ReactiveCommand<Unit, Unit> OpenAnnotation { get; }
+
         /// <inheritdoc />
         public bool IsExpanded
         {

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

@@ -20,6 +20,7 @@ public class PullRequestAnnotationsViewModel : PanePageViewModelBase, IPullReque
     {
         private readonly IPullRequestSessionManager sessionManager;
 
+        IPullRequestSession session;
         string title;
         string checkSuiteName;
         string checkRunName;
@@ -56,7 +57,7 @@ public async Task InitializeAsync(LocalRepositoryModel localRepository, IConnect
                 RemoteRepositoryOwner = owner;
                 PullRequestNumber = pullRequestNumber;
                 CheckRunId = checkRunId;
-                var session = await sessionManager.GetSession(owner, repo, pullRequestNumber);
+                session = await sessionManager.GetSession(owner, repo, pullRequestNumber);
                 Load(session.PullRequest);
             }
             finally
@@ -123,12 +124,18 @@ void Load(PullRequestDetailModel pullRequest)
                 CheckSuiteName = checkSuiteRun.checkSuite.ApplicationName;
                 CheckRunName = checkSuiteRun.checkRun.Name;
 
-                AnnotationsDictionary = checkSuiteRun.checkRun.Annotations
-                    .GroupBy(annotation => annotation.Path)
+                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(annotation))
+                        path => path,
+                        path => annotationsLookup[path]
+                            .Select(annotation => new PullRequestAnnotationItemViewModel(annotation, changedFiles.Contains(path)))
                             .Cast<IPullRequestAnnotationItemViewModel>()
                             .ToArray()
                         );
@@ -138,6 +145,5 @@ void Load(PullRequestDetailModel pullRequest)
                 IsBusy = false;
             }
         }
-
     }
 }

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestAnnotationItemViewModel.cs

@@ -1,4 +1,6 @@
-using GitHub.Models;
+using System.Reactive;
+using GitHub.Models;
+using ReactiveUI;
 
 namespace GitHub.ViewModels.GitHubPane
 {
@@ -21,5 +23,15 @@ public interface IPullRequestAnnotationItemViewModel
         /// Gets or sets a flag to control the expanded state.
         /// </summary>
         bool IsExpanded { get; set; }
+
+        /// <summary>
+        /// Gets a flag which indicates this annotation item is from a file changed in this pull request.
+        /// </summary>
+        bool IsFileInPullRequest { get; }
+
+        /// <summary>
+        /// Gets a command which opens the annotation in the diff view.
+        /// </summary>
+        ReactiveCommand<Unit, Unit> OpenAnnotation { get; }
     }
 }