Rename to ToggleInlineCommentMarginCommand

Rename EnableInlineCommentsCommand to ToggleInlineCommentMarginCommand.

Author: jcansdale

…Commands/IEnableInlineCommentsCommand.cs …nds/IToggleInlineCommentMarginCommand.cssrc/GitHub.Exports/Commands/IEnableInlineCommentsCommand.cs renamed to src/GitHub.Exports/Commands/IToggleInlineCommentMarginCommand.cs src/GitHub.Exports/Commands/IEnableInlineCommentsCommand.cs renamed to src/GitHub.Exports/Commands/IToggleInlineCommentMarginCommand.cs

@@ -2,7 +2,7 @@
 
 namespace GitHub.InlineReviews.Commands
 {
-    public interface IEnableInlineCommentsCommand : IVsCommand
+    public interface IToggleInlineCommentMarginCommand : IVsCommand
     {
     }
 }

src/GitHub.Exports/GitHub.Exports.csproj

@@ -145,7 +145,7 @@
   <ItemGroup>
     <Compile Include="Commands\ICopyLinkCommand.cs" />
     <Compile Include="Commands\IBlameLinkCommand.cs" />
-    <Compile Include="Commands\IEnableInlineCommentsCommand.cs" />
+    <Compile Include="Commands\IToggleInlineCommentMarginCommand.cs" />
     <Compile Include="Commands\IOpenLinkCommand.cs" />
     <Compile Include="Commands\ICreateGistCommand.cs" />
     <Compile Include="Commands\IShowCurrentPullRequestCommand.cs" />

src/GitHub.Exports/Settings/PkgCmdID.cs

@@ -26,6 +26,6 @@ public static class PkgCmdIDList
         // IDs defined in InlineReviewsPackage.vsct
         public const int NextInlineCommentId = 0x1001;
         public const int PreviousInlineCommentId = 0x1002;
-        public const int EnableInlineCommentsId = 0x1003; // TODO: Add to .vsct
+        public const int toggleInlineCommentMarginCommand = 0x1003; // TODO: Add to .vsct
     };
 }

…/Commands/EnableInlineCommentsCommand.cs …ands/ToggleInlineCommentMarginCommand.cssrc/GitHub.InlineReviews/Commands/EnableInlineCommentsCommand.cs renamed to src/GitHub.InlineReviews/Commands/ToggleInlineCommentMarginCommand.cs src/GitHub.InlineReviews/Commands/EnableInlineCommentsCommand.cs renamed to src/GitHub.InlineReviews/Commands/ToggleInlineCommentMarginCommand.cs

@@ -11,8 +11,8 @@
 
 namespace GitHub.InlineReviews.Commands
 {
-    [Export(typeof(IEnableInlineCommentsCommand))]
-    public class EnableInlineCommentsCommand : VsCommand, IEnableInlineCommentsCommand
+    [Export(typeof(IToggleInlineCommentMarginCommand))]
+    public class ToggleInlineCommentMarginCommand : VsCommand, IToggleInlineCommentMarginCommand
     {
         /// <summary>
         /// Gets the GUID of the group the command belongs to.
@@ -22,13 +22,13 @@ public class EnableInlineCommentsCommand : VsCommand, IEnableInlineCommentsComma
         /// <summary>
         /// Gets the numeric identifier of the command.
         /// </summary>
-        public const int CommandId = PkgCmdIDList.EnableInlineCommentsId;
+        public const int CommandId = PkgCmdIDList.toggleInlineCommentMarginCommand;
 
         readonly Lazy<IVsTextManager> textManager;
         readonly Lazy<IVsEditorAdaptersFactoryService> editorAdapter;
 
         [ImportingConstructor]
-        public EnableInlineCommentsCommand(
+        public ToggleInlineCommentMarginCommand(
             IGitHubServiceProvider serviceProvider,
             Lazy<IVsEditorAdaptersFactoryService> editorAdapter) : base(CommandSet, CommandId)
         {

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -69,7 +69,7 @@
     <Compile Include="..\common\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
-    <Compile Include="Commands\EnableInlineCommentsCommand.cs" />
+    <Compile Include="Commands\ToggleInlineCommentMarginCommand.cs" />
     <Compile Include="Commands\InlineCommentNavigationCommand.cs" />
     <Compile Include="Commands\PreviousInlineCommentCommand.cs" />
     <Compile Include="Commands\NextInlineCommentCommand.cs" />

src/GitHub.InlineReviews/Margins/CommentsMargin.cs

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

src/GitHub.InlineReviews/Margins/CommentsMarginProvider.cs

@@ -21,13 +21,13 @@ namespace GitHub.InlineReviews.Margins
     internal sealed class CommentsMarginFactory : IWpfTextViewMarginProvider
     {
         readonly IPullRequestSessionManager sessionManager;
-        readonly IEnableInlineCommentsCommand enableInlineCommentsCommand;
+        readonly IToggleInlineCommentMarginCommand enableInlineCommentsCommand;
         readonly IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand;
         readonly IPackageSettings packageSettings;
 
         [ImportingConstructor]
         public CommentsMarginFactory(
-            IEnableInlineCommentsCommand enableInlineCommentsCommand,
+            IToggleInlineCommentMarginCommand enableInlineCommentsCommand,
             IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand,
             IPullRequestSessionManager sessionManager,
             IPackageSettings packageSettings)

src/GitHub.InlineReviews/ViewModels/CommentsMarginViewModel.cs

@@ -10,9 +10,9 @@ public class CommentsMarginViewModel : ReactiveObject
         int commentsInFile;
         bool marginEnabled;
 
-        public CommentsMarginViewModel(ICommand enableInlineComments, ICommand viewChangesCommand)
+        public CommentsMarginViewModel(ICommand toggleInlineCommentMarginCommand, ICommand viewChangesCommand)
         {
-            EnableInlineCommentsCommand = enableInlineComments;
+            ToggleInlineCommentMarginCommand = toggleInlineCommentMarginCommand;
             ViewChangesCommand = viewChangesCommand;
         }
 
@@ -40,7 +40,7 @@ public bool MarginEnabled
             set { this.RaiseAndSetIfChanged(ref marginEnabled, value); }
         }
 
-        public ICommand EnableInlineCommentsCommand { get; }
+        public ICommand ToggleInlineCommentMarginCommand { get; }
 
         public ICommand ViewChangesCommand { get; }
     }

src/GitHub.InlineReviews/Views/CommentsMarginView.xaml

@@ -17,7 +17,7 @@
     </UserControl.Resources>
 
     <StackPanel Orientation="Horizontal">
-        <CheckBox Command="{Binding EnableInlineCommentsCommand}" IsChecked="{Binding MarginEnabled, Mode=OneWay}" Margin="4 0">
+        <CheckBox Command="{Binding ToggleInlineCommentMarginCommand}" IsChecked="{Binding MarginEnabled, Mode=OneWay}" Margin="4 0">
             <TextBlock VerticalAlignment="Center">
                 <Run Text="{Binding FileName}"/>
                 <ghfvs:OcticonImage Icon="comment_discussion" Height="10" Margin="-2 0" />