Merge branch 'master' into master

jcansdale · web-flow · commit 7114209cbd18 · 2018-12-04T17:29:28.000Z
diff --git a/README.md b/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)
 
diff --git a/scripts/modules.ps1 b/scripts/modules.ps1
@@ -115,7 +115,9 @@ New-Module -ScriptBlock {
     }
 
     function Build-Solution([string]$solution, [string]$target, [string]$configuration, [switch]$ForVSInstaller, [bool]$Deploy = $false) {
-        Run-Command -Fatal { & $nuget restore $solution -NonInteractive -Verbosity detailed }
+        $msbuild = Find-MSBuild
+
+        Run-Command -Fatal { & $nuget restore $solution -NonInteractive -Verbosity detailed -MSBuildPath (Split-Path -parent $msbuild) }
         $flag1 = ""
         $flag2 = ""
         if ($ForVSInstaller) {
@@ -127,8 +129,6 @@ New-Module -ScriptBlock {
             $flag1 = "/p:Package=Skip"
         }
 
-        $msbuild = Find-MSBuild
-
         Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2"
         Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2 }
     }
diff --git a/src/GitHub.App/Services/DialogService.cs b/src/GitHub.App/Services/DialogService.cs
@@ -16,21 +16,31 @@ public class DialogService : IDialogService
     {
         readonly IViewViewModelFactory factory;
         readonly IShowDialogService showDialog;
+        readonly IGitHubContextService gitHubContextService;
 
         [ImportingConstructor]
         public DialogService(
             IViewViewModelFactory factory,
-            IShowDialogService showDialog)
+            IShowDialogService showDialog,
+            IGitHubContextService gitHubContextService)
         {
             Guard.ArgumentNotNull(factory, nameof(factory));
             Guard.ArgumentNotNull(showDialog, nameof(showDialog));
+            Guard.ArgumentNotNull(showDialog, nameof(gitHubContextService));
 
             this.factory = factory;
             this.showDialog = showDialog;
+            this.gitHubContextService = gitHubContextService;
         }
 
         public async Task<CloneDialogResult> ShowCloneDialog(IConnection connection, string url = null)
         {
+            if (string.IsNullOrEmpty(url))
+            {
+                var clipboardContext = gitHubContextService.FindContextFromClipboard();
+                url = clipboardContext?.Url;
+            }
+
             var viewModel = factory.CreateViewModel<IRepositoryCloneViewModel>();
             if (url != null)
             {
diff --git a/src/GitHub.App/Services/GitHubContextService.cs b/src/GitHub.App/Services/GitHubContextService.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using System.Linq;
 using System.Windows;
+using System.Globalization;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
@@ -25,6 +26,7 @@ public class GitHubContextService : IGitHubContextService
     {
         readonly IGitHubServiceProvider serviceProvider;
         readonly IGitService gitService;
+        readonly IVSServices vsServices;
         readonly Lazy<IVsTextManager2> textManager;
 
         // USERID_REGEX = /[a-z0-9][a-z0-9\-\_]*/i
@@ -61,13 +63,38 @@ public class GitHubContextService : IGitHubContextService
         static readonly Regex tempFileObjectishRegex = new Regex(@"\\TFSTemp\\[^\\]*[.](?<objectish>[a-z0-9]{8})[.][^.\\]*$", RegexOptions.Compiled);
 
         [ImportingConstructor]
-        public GitHubContextService(IGitHubServiceProvider serviceProvider, IGitService gitService)
+        public GitHubContextService(IGitHubServiceProvider serviceProvider, IGitService gitService, IVSServices vsServices)
         {
             this.serviceProvider = serviceProvider;
             this.gitService = gitService;
+            this.vsServices = vsServices;
             textManager = new Lazy<IVsTextManager2>(() => serviceProvider.GetService<SVsTextManager, IVsTextManager2>());
         }
 
+        /// <inheritdoc/>
+        public void TryNavigateToContext(string repositoryDir, GitHubContext context)
+        {
+            if (context?.LinkType == LinkType.Blob)
+            {
+                var (commitish, path, commitSha) = ResolveBlob(repositoryDir, context);
+                if (commitish == null && path == null)
+                {
+                    var message = string.Format(CultureInfo.CurrentCulture, Resources.CouldntFindCorrespondingFile, context.Url);
+                    vsServices.ShowMessageBoxInfo(message);
+                    return;
+                }
+
+                var hasChanges = HasChangesInWorkingDirectory(repositoryDir, commitish, path);
+                if (hasChanges)
+                {
+                    var message = string.Format(CultureInfo.CurrentCulture, Resources.ChangesInWorkingDirectoryMessage, commitish);
+                    vsServices.ShowMessageBoxInfo(message);
+                }
+
+                TryOpenFile(repositoryDir, context);
+            }
+        }
+
         /// <inheritdoc/>
         public GitHubContext FindContextFromClipboard()
         {
diff --git a/src/GitHub.App/Services/PullRequestEditorService.cs b/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.
diff --git a/src/GitHub.App/Services/RepositoryCloneService.cs b/src/GitHub.App/Services/RepositoryCloneService.cs
@@ -36,7 +36,9 @@ public class RepositoryCloneService : IRepositoryCloneService
         readonly IVSGitServices vsGitServices;
         readonly ITeamExplorerServices teamExplorerServices;
         readonly IGraphQLClientFactory graphqlFactory;
+        readonly IGitHubContextService gitHubContextService;
         readonly IUsageTracker usageTracker;
+        readonly Lazy<EnvDTE.DTE> dte;
         ICompiledQuery<ViewerRepositoriesModel> readViewerRepositories;
 
         [ImportingConstructor]
@@ -45,13 +47,17 @@ public RepositoryCloneService(
             IVSGitServices vsGitServices,
             ITeamExplorerServices teamExplorerServices,
             IGraphQLClientFactory graphqlFactory,
-            IUsageTracker usageTracker)
+            IGitHubContextService gitHubContextService,
+            IUsageTracker usageTracker,
+            IGitHubServiceProvider sp)
         {
             this.operatingSystem = operatingSystem;
             this.vsGitServices = vsGitServices;
             this.teamExplorerServices = teamExplorerServices;
             this.graphqlFactory = graphqlFactory;
+            this.gitHubContextService = gitHubContextService;
             this.usageTracker = usageTracker;
+            dte = new Lazy<EnvDTE.DTE>(() => sp.GetService<EnvDTE.DTE>());
 
             defaultClonePath = GetLocalClonePathFromGitProvider(operatingSystem.Environment.GetUserRepositoriesPath());
         }
@@ -125,7 +131,10 @@ public async Task CloneOrOpenRepository(
             var isDotCom = HostAddress.IsGitHubDotComUri(repositoryUrl);
             if (DestinationDirectoryExists(repositoryPath))
             {
-                teamExplorerServices.OpenRepository(repositoryPath);
+                if (!IsSolutionInRepository(repositoryPath))
+                {
+                    teamExplorerServices.OpenRepository(repositoryPath);
+                }
 
                 if (isDotCom)
                 {
@@ -153,6 +162,36 @@ public async Task CloneOrOpenRepository(
 
             // Give user a chance to choose a solution
             teamExplorerServices.ShowHomePage();
+
+            // Navigate to context for supported URL types (e.g. /blob/ URLs)
+            var context = gitHubContextService.FindContextFromUrl(url);
+            if (context != null)
+            {
+                gitHubContextService.TryNavigateToContext(repositoryPath, context);
+            }
+        }
+
+        bool IsSolutionInRepository(string repositoryPath)
+        {
+            var solutionPath = dte.Value.Solution.FileName;
+            if (string.IsNullOrEmpty(solutionPath))
+            {
+                return false;
+            }
+
+            var isFolder = operatingSystem.Directory.DirectoryExists(solutionPath);
+            var solutionDir = isFolder ? solutionPath : Path.GetDirectoryName(solutionPath);
+            if (string.Equals(repositoryPath, solutionDir, StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            if (solutionDir.StartsWith(repositoryPath + '\\', StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            return false;
         }
 
         /// <inheritdoc/>
diff --git a/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs b/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs
@@ -137,8 +137,8 @@ public async Task InitializeAsync(IConnection connection)
 
             this.WhenAnyValue(x => x.SelectedTabIndex).Subscribe(x => tabs[x].Activate().Forget());
 
-            // Users in group A will see the URL tab by default
-            if (await IsGroupA().ConfigureAwait(false))
+            // When a clipboard URL has been set or a user is in group A, show the URL tab by default
+            if (!string.IsNullOrEmpty(UrlTab.Url) || await IsGroupA().ConfigureAwait(false))
             {
                 SelectedTabIndex = 2;
             }
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestFilesViewModel.cs b/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>
diff --git a/src/GitHub.Exports.Reactive/Models/InlineAnnotationModel.cs b/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;
         
diff --git a/src/GitHub.Exports.Reactive/Services/IPullRequestEditorService.cs b/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.
diff --git a/src/GitHub.Exports/Models/AnnotationModel.cs b/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; }
 
diff --git a/src/GitHub.Exports/Services/IGitHubContextService.cs b/src/GitHub.Exports/Services/IGitHubContextService.cs
@@ -8,6 +8,13 @@ namespace GitHub.Services
     /// </summary>
     public interface IGitHubContextService
     {
+        /// <summary>
+        /// Attempt to navigate to the equivalent context inside Visual Studio.
+        /// </summary>
+        /// <param name="repositoryDir">The target repository</param>
+        /// <param name="context">The context to open.</param>
+        void TryNavigateToContext(string repositoryDir, GitHubContext context);
+
         /// <summary>
         /// Find the context from a URL in the clipboard if any.
         /// </summary>
diff --git a/src/GitHub.InlineReviews/Commands/NextInlineCommentCommand.cs b/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);
             }
 
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());
                     }
 
diff --git a/src/GitHub.Resources/Resources.Designer.cs b/src/GitHub.Resources/Resources.Designer.cs
diff --git a/src/GitHub.Resources/Resources.resx b/src/GitHub.Resources/Resources.resx
@@ -810,7 +810,7 @@ https://git-scm.com/download/win</value>
     <value>There is no active repository to navigate</value>
   </data>
   <data name="ChangesInWorkingDirectoryMessage" xml:space="preserve">
-    <value>This file has changed since the permalink was created</value>
+    <value>The working file is different to the file at '{0}'. Please checkout the corresponding branch, pull request or commit.</value>
   </data>
   <data name="DifferentRepositoryMessage" xml:space="preserve">
     <value>Please open the repository '{0}' and try again</value>
@@ -845,4 +845,7 @@ https://git-scm.com/download/win</value>
   <data name="RepositoriesMustHaveRemoteOriginHowToFix" xml:space="preserve">
     <value>Please rename one of your existing remotes to 'origin' or add a new remote named 'origin' and fetch. This can be done from the command line or by clicking the button below.</value>
   </data>
+  <data name="CouldntFindCorrespondingFile" xml:space="preserve">
+    <value>Couldn't find file corresponding to '{0}' in the repository. Please do a 'git fetch' or checkout the target pull request.</value>
+  </data>
 </root>
diff --git a/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs b/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs
@@ -12,8 +12,6 @@ namespace GitHub.VisualStudio.Commands
     [Export(typeof(IOpenFromClipboardCommand))]
     public class OpenFromClipboardCommand : VsCommand<string>, IOpenFromClipboardCommand
     {
-
-
         readonly Lazy<IGitHubContextService> gitHubContextService;
         readonly Lazy<ITeamExplorerContext> teamExplorerContext;
         readonly Lazy<IVSServices> vsServices;
diff --git a/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs b/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs
diff --git a/test/GitHub.App.UnitTests/Services/GitHubContextServiceTests.cs b/test/GitHub.App.UnitTests/Services/GitHubContextServiceTests.cs
diff --git a/test/GitHub.App.UnitTests/Services/RepositoryCloneServiceTests.cs b/test/GitHub.App.UnitTests/Services/RepositoryCloneServiceTests.cs
diff --git a/test/GitHub.App.UnitTests/Substitutes.cs b/test/GitHub.App.UnitTests/Substitutes.cs
diff --git a/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs b/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs
diff --git a/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs b/test/GitHub.VisualStudio.UnitTests/Commands/OpenFromClipboardCommandTests.cs
diff --git a/test/GitHub.VisualStudio.UnitTests/Substitutes.cs b/test/GitHub.VisualStudio.UnitTests/Substitutes.cs

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,9 @@ New-Module -ScriptBlock {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`function Build-Solution([string]$solution, [string]$target, [string]$configuration, [switch]$ForVSInstaller, [bool]$Deploy = $false) {`
`118`		`- Run-Command -Fatal { & $nuget restore $solution -NonInteractive -Verbosity detailed }`
	`118`	`+ $msbuild = Find-MSBuild`
	`119`	`+`
	`120`	`+ Run-Command -Fatal { & $nuget restore $solution -NonInteractive -Verbosity detailed -MSBuildPath (Split-Path -parent $msbuild) }`
`119`	`121`	`$flag1 = ""`
`120`	`122`	`$flag2 = ""`
`121`	`123`	`if ($ForVSInstaller) {`
`@@ -127,8 +129,6 @@ New-Module -ScriptBlock {`
`127`	`129`	`$flag1 = "/p:Package=Skip"`
`128`	`130`	`}`
`129`	`131`
`130`		`- $msbuild = Find-MSBuild`
`131`		`-`
`132`	`132`	`Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2"`
`133`	`133`	`Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2 }`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,13 +298,13 @@ public Task<IDifferenceViewer> OpenDiff(`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`/// <inheritdoc/>`
`301`		`- public async Task<IDifferenceViewer> OpenDiff(IPullRequestSession session, string relativePath, string headSha, int fromLine)`
	`301`	`+ public async Task<IDifferenceViewer> OpenDiff(IPullRequestSession session, string relativePath, string headSha, int nextInlineTagFromLine)`
`302`	`302`	`{`
`303`	`303`	`var diffViewer = await OpenDiff(session, relativePath, headSha, scrollToFirstDraftOrDiff: false);`
`304`	`304`
`305`	`305`	`var param = (object) new InlineCommentNavigationParams`
`306`	`306`	`{`
`307`		`- FromLine = fromLine,`
	`307`	`+ FromLine = nextInlineTagFromLine,`
`308`	`308`	`};`
`309`	`309`
`310`	`310`	`// HACK: We need to wait here for the inline comment tags to initialize so we can find the next inline comment.`
Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ public async Task InitializeAsync(IConnection connection)`
`137`	`137`
`138`	`138`	`this.WhenAnyValue(x => x.SelectedTabIndex).Subscribe(x => tabs[x].Activate().Forget());`
`139`	`139`
`140`		`- // Users in group A will see the URL tab by default`
`141`		`- if (await IsGroupA().ConfigureAwait(false))`
	`140`	`+ // When a clipboard URL has been set or a user is in group A, show the URL tab by default`
	`141`	`+ if (!string.IsNullOrEmpty(UrlTab.Url) \|\| await IsGroupA().ConfigureAwait(false))`
`142`	`142`	`{`
`143`	`143`	`SelectedTabIndex = 2;`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,10 @@ private async Task OpenFirstAnnotation(IPullRequestEditorService editorService,`
`83`	`83`
`84`	`84`	`if (annotationModel != null)`
`85`	`85`	`{`
`86`		`- await editorService.OpenDiff(pullRequestSession, file.RelativePath, annotationModel.HeadSha, annotationModel.EndLine);`
	`86`	`+ //AnnotationModel.EndLine is a 1-based number`
	`87`	`+ //EditorService.OpenDiff takes a 0-based line number to start searching AFTER and will open the next tag`
	`88`	`+ var nextInlineCommentFromLine = annotationModel.EndLine - 2;`
	`89`	`+ await editorService.OpenDiff(pullRequestSession, file.RelativePath, annotationModel.HeadSha, nextInlineCommentFromLine);`
`87`	`90`	`}`
`88`	`91`	`}`
`89`	`92`
`@@ -247,7 +250,7 @@ async Task<InlineAnnotationModel> GetFirstAnnotation(IPullRequestFileNode file,`
`247`	`250`	`var sessionFile = await pullRequestSession.GetFile(file.RelativePath);`
`248`	`251`	`var annotations = sessionFile.InlineAnnotations;`
`249`	`252`
`250`		`- return annotations.FirstOrDefault(model => model.AnnotationLevel == annotationLevel);`
	`253`	`+ return annotations.OrderBy(model => model.EndLine).FirstOrDefault(model => model.AnnotationLevel == annotationLevel);`
`251`	`254`	`}`
`252`	`255`
`253`	`256`	`/// <summary>`