Merge branch 'master' into fixes/include-e_sqlite.dll-in-vsix

Author: jcansdale

README.md

@@ -18,6 +18,7 @@ Most of the extension UI lives in the Team Explorer pane, which is available fro
 Official builds of this extension are available at [the official website](https://visualstudio.github.com).
 
 [![Build status](https://ci.appveyor.com/api/projects/status/dl8is5iqwt9qf3t7/branch/master?svg=true)](https://ci.appveyor.com/project/github-windows/visualstudio/branch/master)
+[![Build Status](https://github-editor-tools.visualstudio.com/VisualStudio/_apis/build/status/github.VisualStudio?branchName=master)](https://github-editor-tools.visualstudio.com/VisualStudio/_build/latest?definitionId=4&branchName=master)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/github-visual-studio/localized.svg)](https://crowdin.com/project/github-visual-studio)
 [![codecov](https://codecov.io/gh/GitHub/VisualStudio/branch/master/graph/badge.svg)](https://codecov.io/gh/GitHub/VisualStudio)
 

src/GitHub.App/Services/PullRequestEditorService.cs

@@ -298,13 +298,13 @@ public Task<IDifferenceViewer> OpenDiff(
         }
 
         /// <inheritdoc/>
-        public async Task<IDifferenceViewer> OpenDiff(IPullRequestSession session, string relativePath, string headSha, int fromLine)
+        public async Task<IDifferenceViewer> OpenDiff(IPullRequestSession session, string relativePath, string headSha, int nextInlineTagFromLine)
         {
             var diffViewer = await OpenDiff(session, relativePath, headSha, scrollToFirstDraftOrDiff: false);
 
             var param = (object) new InlineCommentNavigationParams
             {
-                FromLine = fromLine,
+                FromLine = nextInlineTagFromLine,
             };
 
             // HACK: We need to wait here for the inline comment tags to initialize so we can find the next inline comment.

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

@@ -83,7 +83,10 @@ private async Task OpenFirstAnnotation(IPullRequestEditorService editorService,
 
             if (annotationModel != null)
             {
-                await editorService.OpenDiff(pullRequestSession, file.RelativePath, annotationModel.HeadSha, annotationModel.EndLine);
+                //AnnotationModel.EndLine is a 1-based number
+                //EditorService.OpenDiff takes a 0-based line number to start searching AFTER and will open the next tag
+                var nextInlineCommentFromLine = annotationModel.EndLine - 2;
+                await editorService.OpenDiff(pullRequestSession, file.RelativePath, annotationModel.HeadSha, nextInlineCommentFromLine);
             }
         }
 
@@ -247,7 +250,7 @@ async Task<InlineAnnotationModel> GetFirstAnnotation(IPullRequestFileNode file,
             var sessionFile = await pullRequestSession.GetFile(file.RelativePath);
             var annotations = sessionFile.InlineAnnotations;
 
-            return annotations.FirstOrDefault(model => model.AnnotationLevel == annotationLevel);
+            return annotations.OrderBy(model => model.EndLine).FirstOrDefault(model => model.AnnotationLevel == annotationLevel);
         }
 
         /// <summary>

src/GitHub.Exports.Reactive/Models/InlineAnnotationModel.cs

@@ -35,12 +35,12 @@ public InlineAnnotationModel(CheckSuiteModel checkSuite, CheckRunModel checkRun,
         public string Path => annotation.Path;
 
         /// <summary>
-        /// Gets the start line of the annotation.
+        /// Gets the 1-based start line of the annotation.
         /// </summary>
         public int StartLine => annotation.StartLine;
 
         /// <summary>
-        /// Gets the end line of the annotation.
+        /// Gets the 1-based end line of the annotation.
         /// </summary>
         public int EndLine => annotation.EndLine;
 

src/GitHub.Exports.Reactive/Services/IPullRequestEditorService.cs

@@ -55,9 +55,9 @@ public interface IPullRequestEditorService
         /// The commit SHA of the right hand side of the diff. Pass null to compare with the
         /// working directory, or "HEAD" to compare with the HEAD commit of the pull request.
         /// </param>
-        /// <param name="fromLine">The line number to open</param>
+        /// <param name="nextInlineTagFromLine">The 0-based line number to execute NextInlineCommentCommand from</param>
         /// <returns>The opened diff viewer.</returns>
-        Task<IDifferenceViewer> OpenDiff(IPullRequestSession session, string relativePath, string headSha, int fromLine);
+        Task<IDifferenceViewer> OpenDiff(IPullRequestSession session, string relativePath, string headSha, int nextInlineTagFromLine);
 
         /// <summary>
         /// Find the active text view.

src/GitHub.Exports/Models/AnnotationModel.cs

@@ -6,12 +6,12 @@
     public class CheckRunAnnotationModel
     {
         /// <summary>
-        /// The starting line number (1 indexed).
+        /// The starting 1-based line number (1 indexed).
         /// </summary>
         public int StartLine { get; set; }
 
         /// <summary>
-        /// The ending line number (1 indexed).
+        /// The ending 1-based line number (1 indexed).
         /// </summary>
         public int EndLine { get; set; }
 

src/GitHub.InlineReviews/Commands/NextInlineCommentCommand.cs

@@ -53,7 +53,7 @@ public override Task Execute(InlineCommentNavigationParams parameter)
             if (tags.Count > 0)
             {
                 var cursorPoint = GetCursorPoint(textViews[0], parameter);
-                var next = tags.FirstOrDefault(x => x.Point >= cursorPoint) ?? tags.First();
+                var next = tags.FirstOrDefault(x => x.Point > cursorPoint) ?? tags.First();
                 ShowPeekComments(parameter, next.TextView, next.Tag, textViews);
             }
 

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());
                     }