Keep CA happy

Author: jcansdale

src/GitHub.App/Services/PullRequestEditorService.cs

@@ -109,9 +109,7 @@ public async Task<ITextView> OpenFile(
                     if (!workingDirectory)
                     {
                         AddBufferTag(wpfTextView.TextBuffer, session, fullPath, commitSha, null);
-
-                        var file = await session.GetFile(relativePath);
-                        EnableNavigateToEditor(textView, session, file);
+                        EnableNavigateToEditor(textView, session);
                     }
                 }
 
@@ -201,9 +199,9 @@ await pullRequestService.ExtractToTempFile(
                 if (!workingDirectory)
                 {
                     AddBufferTag(diffViewer.RightView.TextBuffer, session, rightPath, file.CommitSha, DiffSide.Right);
-                    EnableNavigateToEditor(diffViewer.LeftView, session, file);
-                    EnableNavigateToEditor(diffViewer.RightView, session, file);
-                    EnableNavigateToEditor(diffViewer.InlineView, session, file);
+                    EnableNavigateToEditor(diffViewer.LeftView, session);
+                    EnableNavigateToEditor(diffViewer.RightView, session);
+                    EnableNavigateToEditor(diffViewer.InlineView, session);
                 }
 
                 if (workingDirectory)
@@ -492,17 +490,17 @@ void AddBufferTag(
             }
         }
 
-        void EnableNavigateToEditor(ITextView textView, IPullRequestSession session, IPullRequestSessionFile file)
+        void EnableNavigateToEditor(ITextView textView, IPullRequestSession session)
         {
             var vsTextView = vsEditorAdaptersFactory.GetViewAdapter(textView);
-            EnableNavigateToEditor(vsTextView, session, file);
+            EnableNavigateToEditor(vsTextView, session);
         }
 
-        void EnableNavigateToEditor(IVsTextView vsTextView, IPullRequestSession session, IPullRequestSessionFile file)
+        void EnableNavigateToEditor(IVsTextView vsTextView, IPullRequestSession session)
         {
             var commandGroup = VSConstants.CMDSETID.StandardCommandSet2K_guid;
             var commandId = (int)VSConstants.VSStd2KCmdID.RETURN;
-            new TextViewCommandDispatcher(vsTextView, commandGroup, commandId, openFileInSolutionCommand);
+            TextViewCommandDispatcher.AddCommandFilter(vsTextView, commandGroup, commandId, openFileInSolutionCommand);
 
             EnableNavigateStatusBarMessage(vsTextView, session);
         }

src/GitHub.App/Services/TextViewCommandDispatcher.cs

@@ -21,14 +21,19 @@ class TextViewCommandDispatcher : IOleCommandTarget, IDisposable
         readonly IOleCommandTarget next;
         readonly ICommand targetCommand;
 
+        public static IDisposable AddCommandFilter(IVsTextView textView, Guid commandGroup, int commandId, ICommand targetCommand)
+        {
+            return new TextViewCommandDispatcher(textView, commandGroup, commandId, targetCommand);
+        }
+
         /// <summary>
         /// Add a command filter to <see cref="IVsTextView"/>.
         /// </summary>
         /// <param name="textView">The text view to filter commands from.</param>
         /// <param name="commandGroup">The group of the command to listen for.</param>
         /// <param name="commandId">The ID of the command to listen for.</param>
         /// <param name="targetCommand">The command to dispatch to.</param>
-        public TextViewCommandDispatcher(IVsTextView textView, Guid commandGroup, int commandId, ICommand targetCommand)
+        TextViewCommandDispatcher(IVsTextView textView, Guid commandGroup, int commandId, ICommand targetCommand)
         {
             this.textView = textView;
             this.commandGroup = commandGroup;