Port changes from #1407.

Enable navigation from diff view to editor

Author: grokys

src/GitHub.App/GitHub.App.csproj

@@ -213,6 +213,7 @@
     <Compile Include="Services\PullRequestEditorService.cs" />
     <Compile Include="Services\TeamExplorerContext.cs" />
     <Compile Include="Services\OAuthCallbackListener.cs" />
+    <Compile Include="Services\TextViewCommandDispatcher.cs" />
     <Compile Include="ViewModels\Dialog\GistCreationViewModel.cs" />
     <Compile Include="ViewModels\Dialog\GitHubDialogWindowViewModel.cs" />
     <Compile Include="ViewModels\Dialog\LoginCredentialsViewModel.cs" />

src/GitHub.App/Services/PullRequestEditorService.cs

@@ -9,12 +9,14 @@
 using GitHub.Commands;
 using GitHub.Extensions;
 using GitHub.Models;
+using GitHub.ViewModels.GitHubPane;
 using GitHub.VisualStudio;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Editor;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Projection;
 using Microsoft.VisualStudio.TextManager.Interop;
 using Task = System.Threading.Tasks.Task;
@@ -151,6 +153,9 @@ public async Task OpenDiff(
                 if (!workingDirectory)
                 {
                     AddBufferTag(diffViewer.RightView.TextBuffer, session, rightPath, DiffSide.Right);
+                    EnableNavigateToEditor(diffViewer.LeftView, session, file);
+                    EnableNavigateToEditor(diffViewer.RightView, session, file);
+                    EnableNavigateToEditor(diffViewer.InlineView, session, file);
                 }
 
                 if (workingDirectory)
@@ -350,6 +355,11 @@ IVsTextView OpenDocument(string fullPath)
             return view;
         }
 
+        void ShowErrorInStatusBar(string message)
+        {
+            statusBar.ShowMessage(message);
+        }
+
         void ShowErrorInStatusBar(string message, Exception e)
         {
             statusBar.ShowMessage(message + ": " + e.Message);
@@ -372,6 +382,54 @@ void AddBufferTag(ITextBuffer buffer, IPullRequestSession session, string path,
             }
         }
 
+        void EnableNavigateToEditor(IWpfTextView textView, IPullRequestSession session, IPullRequestSessionFile file)
+        {
+            var view = vsEditorAdaptersFactory.GetViewAdapter(textView);
+            EnableNavigateToEditor(view, session, file);
+        }
+
+        void EnableNavigateToEditor(IVsTextView textView, IPullRequestSession session, IPullRequestSessionFile file)
+        {
+            var commandGroup = VSConstants.CMDSETID.StandardCommandSet2K_guid;
+            var commandId = (int)VSConstants.VSStd2KCmdID.RETURN;
+            new TextViewCommandDispatcher(textView, commandGroup, commandId).Exec +=
+                async (s, e) => await DoNavigateToEditor(session, file);
+
+            var contextMenuCommandGroup = new Guid(Guids.guidContextMenuSetString);
+            var goToCommandId = PkgCmdIDList.openFileInSolutionCommand;
+            new TextViewCommandDispatcher(textView, contextMenuCommandGroup, goToCommandId).Exec +=
+                async (s, e) => await DoNavigateToEditor(session, file);
+        }
+
+        async Task DoNavigateToEditor(IPullRequestSession session, IPullRequestSessionFile file)
+        {
+            try
+            {
+                if (!session.IsCheckedOut)
+                {
+                    ShowInfoMessage("Checkout PR branch before opening file in solution.");
+                    return;
+                }
+
+                var fullPath = GetAbsolutePath(session, file);
+
+                var activeView = FindActiveView();
+                if (activeView == null)
+                {
+                    ShowErrorInStatusBar("Couldn't find active view");
+                    return;
+                }
+
+                NavigateToEquivalentPosition(activeView, fullPath);
+
+                await usageTracker.IncrementCounter(x => x.NumberOfPRDetailsNavigateToEditor);
+            }
+            catch (Exception e)
+            {
+                ShowErrorInStatusBar("Error navigating to editor", e);
+            }
+        }
+
         async Task<string> ExtractFile(IPullRequestSession session, IPullRequestSessionFile file, bool head)
         {
             var encoding = pullRequestService.GetEncoding(session.LocalRepository, file.RelativePath);
@@ -424,6 +482,13 @@ async Task<string> GetBaseFileName(IPullRequestSession session, IPullRequestSess
             }
         }
 
+        void ShowInfoMessage(string message)
+        {
+            ErrorHandler.ThrowOnFailure(VsShellUtilities.ShowMessageBox(
+                serviceProvider, message, null,
+                OLEMSGICON.OLEMSGICON_INFO, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST));
+        }
+
         static string GetAbsolutePath(IPullRequestSession session, IPullRequestSessionFile file)
         {
             return Path.Combine(session.LocalRepository.LocalPath, file.RelativePath);

src/GitHub.VisualStudio/Views/GitHubPane/TextViewCommandDispatcher.cs renamed to src/GitHub.App/Services/TextViewCommandDispatcher.cs

@@ -3,7 +3,7 @@
 using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.TextManager.Interop;
 
-namespace GitHub.VisualStudio.Views.GitHubPane
+namespace GitHub.Services
 {
     /// <summary>
     /// Intercepts all commands sent to a <see cref="IVsTextView"/> and fires <see href="Exec"/> when a specified command is encountered.

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -400,7 +400,6 @@
     <Compile Include="Views\GitHubPane\NotAGitRepositoryView.xaml.cs">
       <DependentUpon>NotAGitRepositoryView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\GitHubPane\TextViewCommandDispatcher.cs" />
     <Compile Include="Views\TeamExplorer\RepositoryPublishView.xaml.cs">
       <DependentUpon>RepositoryPublishView.xaml</DependentUpon>
     </Compile>