Merge pull request #1552 from github/fixes/1546-make-navigate-to-editor-discoverable

Make Navigate to Editor more discoverable

Author: jcansdale

src/GitHub.App/Resources.Designer.cs

@@ -306,4 +306,13 @@ https://git-scm.com/download/win</value>
   <data name="InProgress" xml:space="preserve">
     <value>InProgress</value>
   </data>
+  <data name="NavigateToEditorStatusMessage" xml:space="preserve">
+    <value>Press Enter to navigate to Editor</value>
+  </data>
+  <data name="NavigateToEditorNotCheckedOutInfoMessage" xml:space="preserve">
+    <value>Checkout PR branch before navigating to Editor</value>
+  </data>
+  <data name="NavigateToEditorNotCheckedOutStatusMessage" xml:space="preserve">
+    <value>Press Enter to navigate to Editor (PR branch must be checked out)</value>
+  </data>
 </root>

src/GitHub.App/Resources.resx

@@ -466,21 +466,37 @@ void AddBufferTag(
 
         void EnableNavigateToEditor(ITextView textView, IPullRequestSession session, IPullRequestSessionFile file)
         {
-            var view = vsEditorAdaptersFactory.GetViewAdapter(textView);
-            EnableNavigateToEditor(view, session, file);
+            var vsTextView = vsEditorAdaptersFactory.GetViewAdapter(textView);
+            EnableNavigateToEditor(vsTextView, session, file);
         }
 
-        void EnableNavigateToEditor(IVsTextView textView, IPullRequestSession session, IPullRequestSessionFile file)
+        void EnableNavigateToEditor(IVsTextView vsTextView, IPullRequestSession session, IPullRequestSessionFile file)
         {
             var commandGroup = VSConstants.CMDSETID.StandardCommandSet2K_guid;
             var commandId = (int)VSConstants.VSStd2KCmdID.RETURN;
-            new TextViewCommandDispatcher(textView, commandGroup, commandId).Exec +=
+            new TextViewCommandDispatcher(vsTextView, 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 +=
+            new TextViewCommandDispatcher(vsTextView, contextMenuCommandGroup, goToCommandId).Exec +=
                 async (s, e) => await DoNavigateToEditor(session, file);
+
+            EnableNavigateStatusBarMessage(vsTextView, session);
+        }
+
+        void EnableNavigateStatusBarMessage(IVsTextView vsTextView, IPullRequestSession session)
+        {
+            var textView = vsEditorAdaptersFactory.GetWpfTextView(vsTextView);
+
+            var statusMessage = session.IsCheckedOut ?
+                App.Resources.NavigateToEditorStatusMessage : App.Resources.NavigateToEditorNotCheckedOutStatusMessage;
+
+            textView.GotAggregateFocus += (s, e) =>
+                statusBar.ShowMessage(statusMessage);
+
+            textView.LostAggregateFocus += (s, e) =>
+                statusBar.ShowMessage(string.Empty);
         }
 
         async Task DoNavigateToEditor(IPullRequestSession session, IPullRequestSessionFile file)
@@ -489,7 +505,7 @@ async Task DoNavigateToEditor(IPullRequestSession session, IPullRequestSessionFi
             {
                 if (!session.IsCheckedOut)
                 {
-                    ShowInfoMessage("Checkout PR branch before opening file in solution.");
+                    ShowInfoMessage(App.Resources.NavigateToEditorNotCheckedOutInfoMessage);
                     return;
                 }