Renaming more InlineComment things

StanleyGoldman · StanleyGoldman · commit 214e1a539d49 · 2018-09-10T14:47:49.000-04:00
diff --git a/src/GitHub.Exports/Commands/INextInlineReviewCommand.cs b/src/GitHub.Exports/Commands/INextInlineReviewCommand.cs
@@ -6,7 +6,7 @@ namespace GitHub.Commands
     /// <summary>
     /// Navigates to and opens the the next inline comment thread in the currently active text view.
     /// </summary>
-    public interface INextInlineCommentCommand : IVsCommand<InlineReviewNavigationParams>
+    public interface INextInlineReviewCommand : IVsCommand<InlineReviewNavigationParams>
     {
     }
 }
diff --git a/src/GitHub.Exports/Commands/IToggleInlineCommentMarginCommand.cs b/src/GitHub.Exports/Commands/IToggleInlineCommentMarginCommand.cs
diff --git a/src/GitHub.Exports/Commands/IToggleInlineReviewMarginCommand.cs b/src/GitHub.Exports/Commands/IToggleInlineReviewMarginCommand.cs
@@ -0,0 +1,6 @@
+﻿namespace GitHub.Commands
+{
+    public interface IToggleInlineReviewMarginCommand : IVsCommand
+    {
+    }
+}
diff --git a/src/GitHub.Exports/Commands/InlineReviewNavigationParams.cs b/src/GitHub.Exports/Commands/InlineReviewNavigationParams.cs
@@ -3,7 +3,7 @@
 namespace GitHub.Commands
 {
     /// <summary>
-    /// Supplies parameters to <see cref="INextInlineCommentCommand"/> and
+    /// Supplies parameters to <see cref="INextInlineReviewCommand"/> and
     /// <see cref="IPreviousInlineCommentCommand"/>.
     /// </summary>
     public class InlineReviewNavigationParams
diff --git a/src/GitHub.InlineReviews/Commands/InlineReviewNavigationCommand.cs b/src/GitHub.InlineReviews/Commands/InlineReviewNavigationCommand.cs
@@ -24,25 +24,25 @@ namespace GitHub.InlineReviews.Commands
     /// <summary>
     /// Base class for commands that navigate between inline comments.
     /// </summary>
-    abstract class InlineCommentNavigationCommand : VsCommand<InlineReviewNavigationParams>
+    abstract class InlineReviewNavigationCommand : VsCommand<InlineReviewNavigationParams>
     {
-        static readonly ILogger log = LogManager.ForContext<InlineCommentNavigationCommand>();
+        static readonly ILogger log = LogManager.ForContext<InlineReviewNavigationCommand>();
         readonly IGitHubServiceProvider serviceProvider;
         readonly IViewTagAggregatorFactoryService tagAggregatorFactory;
-        readonly IInlineCommentPeekService peekService;
+        readonly IInlineReviewPeekService peekService;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="InlineCommentNavigationCommand"/> class.
+        /// Initializes a new instance of the <see cref="InlineReviewNavigationCommand"/> class.
         /// </summary>
         /// <param name="serviceProvider"></param>
         /// <param name="tagAggregatorFactory">The tag aggregator factory.</param>
         /// <param name="peekService">The peek service.</param>
         /// <param name="commandSet">The GUID of the group the command belongs to.</param>
         /// <param name="commandId">The numeric identifier of the command.</param>
-        protected InlineCommentNavigationCommand(
+        protected InlineReviewNavigationCommand(
             IGitHubServiceProvider serviceProvider,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
-            IInlineCommentPeekService peekService,
+            IInlineReviewPeekService peekService,
             Guid commandSet,
             int commandId)
             : base(commandSet, commandId)
@@ -170,7 +170,7 @@ protected IEnumerable<ITextView> GetCurrentTextViews()
             }
             catch (Exception e)
             {
-                log.Error(e, "Exception in InlineCommentNavigationCommand.GetCurrentTextViews()");
+                log.Error(e, "Exception in InlineReviewNavigationCommand.GetCurrentTextViews()");
             }
 
             return result;
diff --git a/src/GitHub.InlineReviews/Commands/NextInlineReviewCommand.cs b/src/GitHub.InlineReviews/Commands/NextInlineReviewCommand.cs
@@ -11,10 +11,10 @@
 namespace GitHub.InlineReviews.Commands
 {
     /// <summary>
-    /// Navigates to and opens the the next inline comment thread in the currently active text view.
+    /// Navigates to and opens the the next inline review in the currently active text view.
     /// </summary>
-    [Export(typeof(INextInlineCommentCommand))]
-    class NextInlineCommentCommand : InlineCommentNavigationCommand, INextInlineCommentCommand
+    [Export(typeof(INextInlineReviewCommand))]
+    class NextInlineReviewCommand : InlineReviewNavigationCommand, INextInlineReviewCommand
     {
         /// <summary>
         /// Gets the GUID of the group the command belongs to.
@@ -27,16 +27,16 @@ class NextInlineCommentCommand : InlineCommentNavigationCommand, INextInlineComm
         public const int CommandId = PkgCmdIDList.NextInlineCommentId;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="NextInlineCommentCommand"/> class.
+        /// Initializes a new instance of the <see cref="NextInlineReviewCommand"/> class.
         /// </summary>
         /// <param name="serviceProvider">The GitHub service provider.</param>
         /// <param name="tagAggregatorFactory">The tag aggregator factory.</param>
         /// <param name="peekService">The peek service.</param>
         [ImportingConstructor]
-        protected NextInlineCommentCommand(
+        protected NextInlineReviewCommand(
             IGitHubServiceProvider serviceProvider,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
-            IInlineCommentPeekService peekService)
+            IInlineReviewPeekService peekService)
             : base(serviceProvider, tagAggregatorFactory, peekService, CommandSet, CommandId)
         {
         }
diff --git a/src/GitHub.InlineReviews/Commands/PreviousInlineReviewCommand.cs b/src/GitHub.InlineReviews/Commands/PreviousInlineReviewCommand.cs
@@ -11,10 +11,10 @@
 namespace GitHub.InlineReviews.Commands
 {
     /// <summary>
-    /// Navigates to and opens the the previous inline comment thread in the currently active text view.
+    /// Navigates to and opens the the previous inline review in the currently active text view.
     /// </summary>
     [Export(typeof(IPreviousInlineCommentCommand))]
-    class PreviousInlineCommentCommand : InlineCommentNavigationCommand, IPreviousInlineCommentCommand
+    class PreviousInlineReviewCommand : InlineReviewNavigationCommand, IPreviousInlineCommentCommand
     {
         /// <summary>
         /// Gets the GUID of the group the command belongs to.
@@ -27,16 +27,16 @@ class PreviousInlineCommentCommand : InlineCommentNavigationCommand, IPreviousIn
         public const int CommandId = PkgCmdIDList.PreviousInlineCommentId;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PreviousInlineCommentCommand"/> class.
+        /// Initializes a new instance of the <see cref="PreviousInlineReviewCommand"/> class.
         /// </summary>
         /// <param name="serviceProvider">The GitHub service provider.</param>
         /// <param name="tagAggregatorFactory">The tag aggregator factory.</param>
         /// <param name="peekService">The peek service.</param>
         [ImportingConstructor]
-        protected PreviousInlineCommentCommand(
+        protected PreviousInlineReviewCommand(
             IGitHubServiceProvider serviceProvider,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
-            IInlineCommentPeekService peekService)
+            IInlineReviewPeekService peekService)
             : base(serviceProvider, tagAggregatorFactory, peekService, CommandSet, CommandId)
         {
         }
diff --git a/src/GitHub.InlineReviews/Commands/ToggleInlineReviewMarginCommand.cs b/src/GitHub.InlineReviews/Commands/ToggleInlineReviewMarginCommand.cs
@@ -12,8 +12,8 @@
 
 namespace GitHub.InlineReviews.Commands
 {
-    [Export(typeof(IToggleInlineCommentMarginCommand))]
-    public class ToggleInlineCommentMarginCommand : VsCommand, IToggleInlineCommentMarginCommand
+    [Export(typeof(IToggleInlineReviewMarginCommand))]
+    public class ToggleInlineReviewMarginCommand : VsCommand, IToggleInlineReviewMarginCommand
     {
         /// <summary>
         /// Gets the GUID of the group the command belongs to.
@@ -30,7 +30,7 @@ public class ToggleInlineCommentMarginCommand : VsCommand, IToggleInlineCommentM
         readonly Lazy<IUsageTracker> usageTracker;
 
         [ImportingConstructor]
-        public ToggleInlineCommentMarginCommand(
+        public ToggleInlineReviewMarginCommand(
             IGitHubServiceProvider serviceProvider,
             Lazy<IVsEditorAdaptersFactoryService> editorAdapter,
             Lazy<IUsageTracker> usageTracker) : base(CommandSet, CommandId)
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -70,10 +70,10 @@
     <Compile Include="..\common\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
-    <Compile Include="Commands\ToggleInlineCommentMarginCommand.cs" />
-    <Compile Include="Commands\InlineCommentNavigationCommand.cs" />
-    <Compile Include="Commands\PreviousInlineCommentCommand.cs" />
-    <Compile Include="Commands\NextInlineCommentCommand.cs" />
+    <Compile Include="Commands\ToggleInlineReviewMarginCommand.cs" />
+    <Compile Include="Commands\InlineReviewNavigationCommand.cs" />
+    <Compile Include="Commands\PreviousInlineReviewCommand.cs" />
+    <Compile Include="Commands\NextInlineReviewCommand.cs" />
     <Compile Include="Margins\InlineCommentTextViewOptions.cs" />
     <Compile Include="Margins\PullRequestFileMargin.cs" />
     <Compile Include="Margins\PullRequestFileMarginProvider.cs" />
@@ -104,9 +104,9 @@
     <Compile Include="Peek\InlineCommentPeekResultPresenter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SampleData\InlineReviewViewModelDesigner.cs" />
-    <Compile Include="Services\IInlineCommentPeekService.cs" />
+    <Compile Include="Services\IInlineReviewPeekService.cs" />
     <Compile Include="Services\IPullRequestSessionService.cs" />
-    <Compile Include="Services\InlineCommentPeekService.cs" />
+    <Compile Include="Services\InlineReviewPeekService.cs" />
     <Compile Include="Services\PullRequestSession.cs" />
     <Compile Include="Services\PullRequestSessionManager.cs" />
     <Compile Include="Margins\InlineCommentMarginProvider.cs" />
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.cs b/src/GitHub.InlineReviews/InlineReviewsPackage.cs
@@ -48,9 +48,9 @@ async Task InitializeMenus()
             var exports = componentModel.DefaultExportProvider;
             var commands = new IVsCommandBase[]
             {
-                exports.GetExportedValue<INextInlineCommentCommand>(),
+                exports.GetExportedValue<INextInlineReviewCommand>(),
                 exports.GetExportedValue<IPreviousInlineCommentCommand>(),
-                exports.GetExportedValue<IToggleInlineCommentMarginCommand>()
+                exports.GetExportedValue<IToggleInlineReviewMarginCommand>()
             };
 
             await JoinableTaskFactory.SwitchToMainThreadAsync();
diff --git a/src/GitHub.InlineReviews/Margins/InlineCommentMargin.cs b/src/GitHub.InlineReviews/Margins/InlineCommentMargin.cs
@@ -33,7 +33,7 @@ public sealed class InlineCommentMargin : IWpfTextViewMargin
 
         public InlineCommentMargin(
             IWpfTextViewHost wpfTextViewHost,
-            IInlineCommentPeekService peekService,
+            IInlineReviewPeekService peekService,
             IEditorFormatMapService editorFormatMapService,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
             Lazy<IPullRequestSessionManager> sessionManager)
diff --git a/src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs b/src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs
@@ -21,7 +21,7 @@ internal sealed class InlineCommentMarginProvider : IWpfTextViewMarginProvider
     {
         readonly Lazy<IEditorFormatMapService> editorFormatMapService;
         readonly Lazy<IViewTagAggregatorFactoryService> tagAggregatorFactory;
-        readonly Lazy<IInlineCommentPeekService> peekService;
+        readonly Lazy<IInlineReviewPeekService> peekService;
         readonly Lazy<IPullRequestSessionManager> sessionManager;
         readonly UIContext uiContext;
 
@@ -30,7 +30,7 @@ public InlineCommentMarginProvider(
             Lazy<IPullRequestSessionManager> sessionManager,
             Lazy<IEditorFormatMapService> editorFormatMapService,
             Lazy<IViewTagAggregatorFactoryService> tagAggregatorFactory,
-            Lazy<IInlineCommentPeekService> peekService)
+            Lazy<IInlineReviewPeekService> peekService)
         {
             this.sessionManager = sessionManager;
             this.editorFormatMapService = editorFormatMapService;
diff --git a/src/GitHub.InlineReviews/Margins/PullRequestFileMargin.cs b/src/GitHub.InlineReviews/Margins/PullRequestFileMargin.cs
@@ -35,15 +35,15 @@ internal class PullRequestFileMargin : IWpfTextViewMargin
 
         public PullRequestFileMargin(
             IWpfTextView textView,
-            IToggleInlineCommentMarginCommand toggleInlineCommentMarginCommand,
+            IToggleInlineReviewMarginCommand toggleInlineReviewMarginCommand,
             IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand,
             IPullRequestSessionManager sessionManager,
             Lazy<IUsageTracker> usageTracker)
         {
             this.textView = textView;
             this.sessionManager = sessionManager;
 
-            viewModel = new PullRequestFileMarginViewModel(toggleInlineCommentMarginCommand, goToSolutionOrPullRequestFileCommand, usageTracker);
+            viewModel = new PullRequestFileMarginViewModel(toggleInlineReviewMarginCommand, goToSolutionOrPullRequestFileCommand, usageTracker);
             visualElement = new PullRequestFileMarginView { DataContext = viewModel, ClipToBounds = true };
 
             visibilitySubscription = viewModel.WhenAnyValue(x => x.Enabled).Subscribe(enabled =>
diff --git a/src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs b/src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs
@@ -22,15 +22,15 @@ namespace GitHub.InlineReviews.Margins
     internal sealed class PullRequestFileMarginProvider : IWpfTextViewMarginProvider
     {
         readonly Lazy<IPullRequestSessionManager> sessionManager;
-        readonly Lazy<IToggleInlineCommentMarginCommand> enableInlineCommentsCommand;
+        readonly Lazy<IToggleInlineReviewMarginCommand> enableInlineCommentsCommand;
         readonly Lazy<IGoToSolutionOrPullRequestFileCommand> goToSolutionOrPullRequestFileCommand;
         readonly Lazy<IPackageSettings> packageSettings;
         readonly Lazy<IUsageTracker> usageTracker;
         readonly UIContext uiContext;
 
         [ImportingConstructor]
         public PullRequestFileMarginProvider(
-            Lazy<IToggleInlineCommentMarginCommand> enableInlineCommentsCommand,
+            Lazy<IToggleInlineReviewMarginCommand> enableInlineCommentsCommand,
             Lazy<IGoToSolutionOrPullRequestFileCommand> goToSolutionOrPullRequestFileCommand,
             Lazy<IPullRequestSessionManager> sessionManager,
             Lazy<IPackageSettings> packageSettings,
diff --git a/src/GitHub.InlineReviews/Peek/InlineCommentPeekableItemSource.cs b/src/GitHub.InlineReviews/Peek/InlineCommentPeekableItemSource.cs
@@ -12,21 +12,21 @@ namespace GitHub.InlineReviews.Peek
 {
     class InlineCommentPeekableItemSource : IPeekableItemSource
     {
-        readonly IInlineCommentPeekService peekService;
+        readonly IInlineReviewPeekService peekService;
         readonly IPullRequestSessionManager sessionManager;
-        readonly INextInlineCommentCommand nextCommentCommand;
+        readonly INextInlineReviewCommand _nextReviewCommand;
         readonly IPreviousInlineCommentCommand previousCommentCommand;
         readonly ICommentService commentService;
 
-        public InlineCommentPeekableItemSource(IInlineCommentPeekService peekService,
+        public InlineCommentPeekableItemSource(IInlineReviewPeekService peekService,
             IPullRequestSessionManager sessionManager,
-            INextInlineCommentCommand nextCommentCommand,
+            INextInlineReviewCommand nextReviewCommand,
             IPreviousInlineCommentCommand previousCommentCommand,
             ICommentService commentService)
         {
             this.peekService = peekService;
             this.sessionManager = sessionManager;
-            this.nextCommentCommand = nextCommentCommand;
+            this._nextReviewCommand = nextReviewCommand;
             this.previousCommentCommand = previousCommentCommand;
             this.commentService = commentService;
         }
@@ -39,7 +39,7 @@ public void AugmentPeekSession(IPeekSession session, IList<IPeekableItem> peekab
                     peekService,
                     session,
                     sessionManager,
-                    nextCommentCommand,
+                    _nextReviewCommand,
                     previousCommentCommand,
                     commentService);
                 viewModel.Initialize().Forget();
diff --git a/src/GitHub.InlineReviews/Peek/InlineCommentPeekableItemSourceProvider.cs b/src/GitHub.InlineReviews/Peek/InlineCommentPeekableItemSourceProvider.cs
@@ -16,23 +16,23 @@ namespace GitHub.InlineReviews.Peek
     [Name("GitHub Inline Comments Peekable Item Source")]
     class InlineCommentPeekableItemSourceProvider : IPeekableItemSourceProvider
     {
-        readonly IInlineCommentPeekService peekService;
+        readonly IInlineReviewPeekService peekService;
         readonly IPullRequestSessionManager sessionManager;
-        readonly INextInlineCommentCommand nextCommentCommand;
+        readonly INextInlineReviewCommand _nextReviewCommand;
         readonly IPreviousInlineCommentCommand previousCommentCommand;
         readonly ICommentService commentService;
 
         [ImportingConstructor]
         public InlineCommentPeekableItemSourceProvider(
-            IInlineCommentPeekService peekService,
+            IInlineReviewPeekService peekService,
             IPullRequestSessionManager sessionManager,
-            INextInlineCommentCommand nextCommentCommand,
+            INextInlineReviewCommand nextReviewCommand,
             IPreviousInlineCommentCommand previousCommentCommand,
             ICommentService commentService)
         {
             this.peekService = peekService;
             this.sessionManager = sessionManager;
-            this.nextCommentCommand = nextCommentCommand;
+            this._nextReviewCommand = nextReviewCommand;
             this.previousCommentCommand = previousCommentCommand;
             this.commentService = commentService;
         }
@@ -42,7 +42,7 @@ public IPeekableItemSource TryCreatePeekableItemSource(ITextBuffer textBuffer)
             return new InlineCommentPeekableItemSource(
                 peekService,
                 sessionManager,
-                nextCommentCommand,
+                _nextReviewCommand,
                 previousCommentCommand,
                 commentService);
         }
diff --git a/src/GitHub.InlineReviews/Services/IInlineReviewPeekService.cs b/src/GitHub.InlineReviews/Services/IInlineReviewPeekService.cs
@@ -9,7 +9,7 @@ namespace GitHub.InlineReviews.Services
     /// <summary>
     /// Shows inline comments in a peek view.
     /// </summary>
-    public interface IInlineCommentPeekService
+    public interface IInlineReviewPeekService
     {
         /// <summary>
         /// Gets the line number for a peek session tracking point.
diff --git a/src/GitHub.InlineReviews/Services/InlineReviewPeekService.cs b/src/GitHub.InlineReviews/Services/InlineReviewPeekService.cs
@@ -23,15 +23,15 @@ namespace GitHub.InlineReviews.Services
     /// <summary>
     /// Shows inline comments in a peek view.
     /// </summary>
-    [Export(typeof(IInlineCommentPeekService))]
-    class InlineCommentPeekService : IInlineCommentPeekService
+    [Export(typeof(IInlineReviewPeekService))]
+    class InlineReviewPeekService : IInlineReviewPeekService
     {
         readonly IOutliningManagerService outliningService;
         readonly IPeekBroker peekBroker;
         readonly IUsageTracker usageTracker;
 
         [ImportingConstructor]
-        public InlineCommentPeekService(
+        public InlineReviewPeekService(
             IOutliningManagerService outliningManager,
             IPeekBroker peekBroker,
             IUsageTracker usageTracker)
diff --git a/src/GitHub.InlineReviews/Tags/InlineGlyphFactory.cs b/src/GitHub.InlineReviews/Tags/InlineGlyphFactory.cs
@@ -12,11 +12,11 @@ namespace GitHub.InlineReviews.Tags
 {
     class InlineGlyphFactory : IGlyphFactory<InlineReviewTag>
     {
-        readonly IInlineCommentPeekService peekService;
+        readonly IInlineReviewPeekService peekService;
         readonly ITextView textView;
 
         public InlineGlyphFactory(
-            IInlineCommentPeekService peekService,
+            IInlineReviewPeekService peekService,
             ITextView textView)
         {
             this.peekService = peekService;
diff --git a/src/GitHub.InlineReviews/ViewModels/InlineReviewPeekViewModel.cs b/src/GitHub.InlineReviews/ViewModels/InlineReviewPeekViewModel.cs
diff --git a/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineReviewPeekViewModelTests.cs b/test/GitHub.InlineReviews.UnitTests/ViewModels/InlineReviewPeekViewModelTests.cs

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace GitHub.Commands`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Navigates to and opens the the next inline comment thread in the currently active text view.`
`8`	`8`	`/// </summary>`
`9`		`- public interface INextInlineCommentCommand : IVsCommand<InlineReviewNavigationParams>`
	`9`	`+ public interface INextInlineReviewCommand : IVsCommand<InlineReviewNavigationParams>`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +namespace GitHub.Commands
 +{
 +    public interface IToggleInlineReviewMarginCommand : IVsCommand
 +    {
 +    }
 +}
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace GitHub.Commands`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`		`- /// Supplies parameters to <see cref="INextInlineCommentCommand"/> and`
	`6`	`+ /// Supplies parameters to <see cref="INextInlineReviewCommand"/> and`
`7`	`7`	`/// <see cref="IPreviousInlineCommentCommand"/>.`
`8`	`8`	`/// </summary>`
`9`	`9`	`public class InlineReviewNavigationParams`