Rename to GoToSolutionOrPullRequestFileCommand

Rename command from OpenFileInSolution to GoToSolutionOrPullRequestFile.

Author: jcansdale

src/GitHub.App/Services/PullRequestEditorService.cs

@@ -36,7 +36,7 @@ public class PullRequestEditorService : IPullRequestEditorService
         readonly IPullRequestService pullRequestService;
         readonly IVsEditorAdaptersFactoryService vsEditorAdaptersFactory;
         readonly IStatusBarNotificationService statusBar;
-        readonly IOpenFileInSolutionCommand openFileInSolutionCommand;
+        readonly IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand;
         readonly IEditorOptionsFactoryService editorOptionsFactoryService;
         readonly IUsageTracker usageTracker;
 
@@ -46,23 +46,23 @@ public PullRequestEditorService(
             IPullRequestService pullRequestService,
             IVsEditorAdaptersFactoryService vsEditorAdaptersFactory,
             IStatusBarNotificationService statusBar,
-            IOpenFileInSolutionCommand openFileInSolutionCommand,
+            IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand,
             IEditorOptionsFactoryService editorOptionsFactoryService,
             IUsageTracker usageTracker)
         {
             Guard.ArgumentNotNull(serviceProvider, nameof(serviceProvider));
             Guard.ArgumentNotNull(pullRequestService, nameof(pullRequestService));
             Guard.ArgumentNotNull(vsEditorAdaptersFactory, nameof(vsEditorAdaptersFactory));
             Guard.ArgumentNotNull(statusBar, nameof(statusBar));
-            Guard.ArgumentNotNull(openFileInSolutionCommand, nameof(openFileInSolutionCommand));
-            Guard.ArgumentNotNull(openFileInSolutionCommand, nameof(editorOptionsFactoryService));
+            Guard.ArgumentNotNull(goToSolutionOrPullRequestFileCommand, nameof(goToSolutionOrPullRequestFileCommand));
+            Guard.ArgumentNotNull(goToSolutionOrPullRequestFileCommand, nameof(editorOptionsFactoryService));
             Guard.ArgumentNotNull(usageTracker, nameof(usageTracker));
 
             this.serviceProvider = serviceProvider;
             this.pullRequestService = pullRequestService;
             this.vsEditorAdaptersFactory = vsEditorAdaptersFactory;
             this.statusBar = statusBar;
-            this.openFileInSolutionCommand = openFileInSolutionCommand;
+            this.goToSolutionOrPullRequestFileCommand = goToSolutionOrPullRequestFileCommand;
             this.editorOptionsFactoryService = editorOptionsFactoryService;
             this.usageTracker = usageTracker;
         }
@@ -516,7 +516,7 @@ void EnableNavigateToEditor(IVsTextView vsTextView, IPullRequestSession session)
         {
             var commandGroup = VSConstants.CMDSETID.StandardCommandSet2K_guid;
             var commandId = (int)VSConstants.VSStd2KCmdID.RETURN;
-            TextViewCommandDispatcher.AddCommandFilter(vsTextView, commandGroup, commandId, openFileInSolutionCommand);
+            TextViewCommandDispatcher.AddCommandFilter(vsTextView, commandGroup, commandId, goToSolutionOrPullRequestFileCommand);
 
             EnableNavigateStatusBarMessage(vsTextView, session);
         }

src/GitHub.Exports/Commands/IGoToSolutionOrPullRequestFileCommand.cs

@@ -0,0 +1,8 @@
+using GitHub.Commands;
+
+namespace GitHub.Commands
+{
+    public interface IGoToSolutionOrPullRequestFileCommand : IVsCommand
+    {
+    }
+}

src/GitHub.Exports/Commands/IOpenFileInSolutionCommand.cs

@@ -156,7 +156,7 @@
     <Compile Include="Commands\INextInlineCommentCommand.cs" />
     <Compile Include="Commands\InlineCommentNavigationParams.cs" />
     <Compile Include="Commands\IPreviousInlineCommentCommand.cs" />
-    <Compile Include="Commands\IOpenFileInSolutionCommand.cs" />
+    <Compile Include="Commands\IGoToSolutionOrPullRequestFileCommand.cs" />
     <Compile Include="Commands\IVsCommand.cs" />
     <Compile Include="Commands\IVsCommandBase.cs" />
     <Compile Include="Exports\ExportForProcess.cs" />

src/GitHub.Exports/GitHub.Exports.csproj

@@ -18,7 +18,7 @@ public static class PkgCmdIDList
         public const int createGistCommand = 0x400;
         public const int openLinkCommand = 0x100;
         public const int copyLinkCommand = 0x101;
-        public const int openFileInSolutionCommand = 0x102;
+        public const int goToSolutionOrPullRequestFileCommand = 0x102;
         public const int githubCommand = 0x320;
         public const int helpCommand = 0x321;
         public const int blameCommand = 0x500;

src/GitHub.Exports/Settings/PkgCmdID.cs

@@ -34,13 +34,13 @@ internal class CommentsMargin : IWpfTextViewMargin
         public CommentsMargin(
             IWpfTextView textView,
             IEnableInlineCommentsCommand enableInlineCommentsCommand,
-            IOpenFileInSolutionCommand openFileInSolutionCommand,
+            IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand,
             IPullRequestSessionManager sessionManager)
         {
             this.textView = textView;
             this.sessionManager = sessionManager;
 
-            viewModel = new CommentsMarginViewModel(enableInlineCommentsCommand, openFileInSolutionCommand);
+            viewModel = new CommentsMarginViewModel(enableInlineCommentsCommand, goToSolutionOrPullRequestFileCommand);
             visualElement = new CommentsMarginView { DataContext = viewModel, ClipToBounds = true };
 
             visibilitySubscription = viewModel.WhenAnyValue(x => x.Enabled).Subscribe(enabled =>

src/GitHub.InlineReviews/Margins/CommentsMargin.cs

@@ -22,18 +22,18 @@ internal sealed class CommentsMarginFactory : IWpfTextViewMarginProvider
     {
         readonly IPullRequestSessionManager sessionManager;
         readonly IEnableInlineCommentsCommand enableInlineCommentsCommand;
-        readonly IOpenFileInSolutionCommand openFileInSolutionCommand;
+        readonly IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand;
         readonly IPackageSettings packageSettings;
 
         [ImportingConstructor]
         public CommentsMarginFactory(
             IEnableInlineCommentsCommand enableInlineCommentsCommand,
-            IOpenFileInSolutionCommand openFileInSolutionCommand,
+            IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand,
             IPullRequestSessionManager sessionManager,
             IPackageSettings packageSettings)
         {
             this.enableInlineCommentsCommand = enableInlineCommentsCommand;
-            this.openFileInSolutionCommand = openFileInSolutionCommand;
+            this.goToSolutionOrPullRequestFileCommand = goToSolutionOrPullRequestFileCommand;
             this.sessionManager = sessionManager;
             this.packageSettings = packageSettings;
         }
@@ -60,7 +60,7 @@ public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTex
                 return null;
             }
 
-            return new CommentsMargin(wpfTextViewHost.TextView, enableInlineCommentsCommand, openFileInSolutionCommand,
+            return new CommentsMargin(wpfTextViewHost.TextView, enableInlineCommentsCommand, goToSolutionOrPullRequestFileCommand,
                 sessionManager);
         }
 

src/GitHub.InlineReviews/Margins/CommentsMarginProvider.cs

@@ -10,10 +10,10 @@ public class CommentsMarginViewModel : ReactiveObject
         int commentsInFile;
         bool marginEnabled;
 
-        public CommentsMarginViewModel(ICommand enableInlineComments, ICommand openFileInSolutionCommand)
+        public CommentsMarginViewModel(ICommand enableInlineComments, ICommand viewChangesCommand)
         {
             EnableInlineCommentsCommand = enableInlineComments;
-            ViewChangesCommand = openFileInSolutionCommand;
+            ViewChangesCommand = viewChangesCommand;
         }
 
         public bool Enabled

src/GitHub.InlineReviews/ViewModels/CommentsMarginViewModel.cs

@@ -14,8 +14,8 @@
 
 namespace GitHub.Commands
 {
-    [Export(typeof(IOpenFileInSolutionCommand))]
-    public class OpenFileInSolutionCommand : VsCommand, IOpenFileInSolutionCommand
+    [Export(typeof(IGoToSolutionOrPullRequestFileCommand))]
+    public class GoToSolutionOrPullRequestFileCommand : VsCommand, IGoToSolutionOrPullRequestFileCommand
     {
         /// <summary>
         /// Gets the GUID of the group the command belongs to.
@@ -25,7 +25,7 @@ public class OpenFileInSolutionCommand : VsCommand, IOpenFileInSolutionCommand
         /// <summary>
         /// Gets the numeric identifier of the command.
         /// </summary>
-        public const int CommandId = PkgCmdIDList.openFileInSolutionCommand;
+        public const int CommandId = PkgCmdIDList.goToSolutionOrPullRequestFileCommand;
 
         readonly IGitHubServiceProvider serviceProvider;
         readonly Lazy<IVsEditorAdaptersFactoryService> editorAdapter;
@@ -35,7 +35,7 @@ public class OpenFileInSolutionCommand : VsCommand, IOpenFileInSolutionCommand
         readonly Lazy<IUsageTracker> usageTracker;
 
         [ImportingConstructor]
-        public OpenFileInSolutionCommand(
+        public GoToSolutionOrPullRequestFileCommand(
             IGitHubServiceProvider serviceProvider,
             Lazy<IVsEditorAdaptersFactoryService> editorAdapter,
             Lazy<IPullRequestSessionManager> sessionManager,

…io/Commands/OpenFileInSolutionCommand.cs …/GoToSolutionOrPullRequestFileCommand.cssrc/GitHub.VisualStudio/Commands/OpenFileInSolutionCommand.cs renamed to src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs src/GitHub.VisualStudio/Commands/OpenFileInSolutionCommand.cs renamed to src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs

@@ -323,7 +323,7 @@
     <Compile Include="Commands\ShowCurrentPullRequestCommand.cs" />
     <Compile Include="Commands\ShowGitHubPaneCommand.cs" />
     <Compile Include="Commands\OpenPullRequestsCommand.cs" />
-    <Compile Include="Commands\OpenFileInSolutionCommand.cs" />
+    <Compile Include="Commands\GoToSolutionOrPullRequestFileCommand.cs" />
     <Compile Include="GitContextPackage.cs" />
     <Compile Include="GitHubPanePackage.cs" />
     <Compile Include="IServiceProviderPackage.cs" />