Merge pull request #2092 from github/fixes/inline-comment-tagger-crash

StanleyGoldman · web-flow · commit dd19d593832c · 2018-12-04T08:15:17.000-05:00
Fixing InlineCommentTagger Crash
diff --git a/src/GitHub.InlineReviews/Tags/InlineCommentTagger.cs b/src/GitHub.InlineReviews/Tags/InlineCommentTagger.cs
@@ -95,12 +95,11 @@ public IEnumerable<ITagSpan<InlineCommentTag>> GetTags(NormalizedSnapshotSpanCol
                     Dictionary<int, InlineAnnotationModel[]> spanAnnotationsByLine = null;
                     if (side == DiffSide.Right)
                     {
-                        var spanAnnotations = file.InlineAnnotations.Where(x =>
+                        var spanAnnotations = file.InlineAnnotations?.Where(x =>
                                 x.EndLine - 1 >= startLine &&
                                 x.EndLine - 1 <= endLine);
 
-                        spanAnnotationsByLine = spanAnnotations
-                            .GroupBy(model => model.EndLine)
+                        spanAnnotationsByLine = spanAnnotations?.GroupBy(model => model.EndLine)
                             .ToDictionary(models => models.Key - 1, models => models.ToArray());
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,11 @@ public IEnumerable<ITagSpan<InlineCommentTag>> GetTags(NormalizedSnapshotSpanCol`
`95`	`95`	`Dictionary<int, InlineAnnotationModel[]> spanAnnotationsByLine = null;`
`96`	`96`	`if (side == DiffSide.Right)`
`97`	`97`	`{`
`98`		`- var spanAnnotations = file.InlineAnnotations.Where(x =>`
	`98`	`+ var spanAnnotations = file.InlineAnnotations?.Where(x =>`
`99`	`99`	`x.EndLine - 1 >= startLine &&`
`100`	`100`	`x.EndLine - 1 <= endLine);`
`101`	`101`
`102`		`- spanAnnotationsByLine = spanAnnotations`
`103`		`- .GroupBy(model => model.EndLine)`
	`102`	`+ spanAnnotationsByLine = spanAnnotations?.GroupBy(model => model.EndLine)`
`104`	`103`	`.ToDictionary(models => models.Key - 1, models => models.ToArray());`
`105`	`104`	`}`
`106`	`105`