Restoring names of a lot of things

StanleyGoldman · StanleyGoldman · commit b24f8a2bf3a0 · 2018-09-10T15:58:47.000-04:00
diff --git a/src/GitHub.App/Services/PullRequestEditorService.cs b/src/GitHub.App/Services/PullRequestEditorService.cs
@@ -254,7 +254,7 @@ public async Task<IDifferenceViewer> OpenDiff(IPullRequestSession session, strin
         {
             var diffViewer = await OpenDiff(session, relativePath, headSha, scrollToFirstDiff: false);
 
-            var param = (object) new InlineReviewNavigationParams
+            var param = (object) new InlineCommentNavigationParams
             {
                 FromLine = fromLine,
             };
diff --git a/src/GitHub.Exports/Commands/INextInlineCommentCommand.cs b/src/GitHub.Exports/Commands/INextInlineCommentCommand.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 INextInlineReviewCommand : IVsCommand<InlineReviewNavigationParams>
+    public interface INextInlineCommentCommand : IVsCommand<InlineCommentNavigationParams>
     {
     }
 }
diff --git a/src/GitHub.Exports/Commands/IPreviousInlineCommentCommand.cs b/src/GitHub.Exports/Commands/IPreviousInlineCommentCommand.cs
@@ -6,7 +6,7 @@ namespace GitHub.Commands
     /// <summary>
     /// Navigates to and opens the the previous inline comment thread in the currently active text view.
     /// </summary>
-    public interface IPreviousInlineCommentCommand : IVsCommand<InlineReviewNavigationParams>
+    public interface IPreviousInlineCommentCommand : IVsCommand<InlineCommentNavigationParams>
     {
     }
 }
diff --git a/src/GitHub.Exports/Commands/InlineCommentNavigationParams.cs b/src/GitHub.Exports/Commands/InlineCommentNavigationParams.cs
@@ -3,10 +3,10 @@
 namespace GitHub.Commands
 {
     /// <summary>
-    /// Supplies parameters to <see cref="INextInlineReviewCommand"/> and
+    /// Supplies parameters to <see cref="INextInlineCommentCommand"/> and
     /// <see cref="IPreviousInlineCommentCommand"/>.
     /// </summary>
-    public class InlineReviewNavigationParams
+    public class InlineCommentNavigationParams
     {
         /// <summary>
         /// Gets or sets the line that should be used as the start point for navigation.
diff --git a/src/GitHub.InlineReviews/Commands/InlineCommentNavigationCommand.cs b/src/GitHub.InlineReviews/Commands/InlineCommentNavigationCommand.cs
@@ -24,22 +24,22 @@ namespace GitHub.InlineReviews.Commands
     /// <summary>
     /// Base class for commands that navigate between inline comments.
     /// </summary>
-    abstract class InlineReviewNavigationCommand : VsCommand<InlineReviewNavigationParams>
+    abstract class InlineCommentNavigationCommand : VsCommand<InlineCommentNavigationParams>
     {
-        static readonly ILogger log = LogManager.ForContext<InlineReviewNavigationCommand>();
+        static readonly ILogger log = LogManager.ForContext<InlineCommentNavigationCommand>();
         readonly IGitHubServiceProvider serviceProvider;
         readonly IViewTagAggregatorFactoryService tagAggregatorFactory;
         readonly IInlineReviewPeekService peekService;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="InlineReviewNavigationCommand"/> class.
+        /// Initializes a new instance of the <see cref="InlineCommentNavigationCommand"/> 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 InlineReviewNavigationCommand(
+        protected InlineCommentNavigationCommand(
             IGitHubServiceProvider serviceProvider,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
             IInlineReviewPeekService peekService,
@@ -60,7 +60,7 @@ protected InlineReviewNavigationCommand(
         /// <param name="parameter">The parameters.</param>
         /// <param name="textView">The text view.</param>
         /// <returns></returns>
-        protected int GetCursorPoint(ITextView textView, InlineReviewNavigationParams parameter)
+        protected int GetCursorPoint(ITextView textView, InlineCommentNavigationParams parameter)
         {
             if (parameter?.FromLine != null)
             {
@@ -170,7 +170,7 @@ protected IEnumerable<ITextView> GetCurrentTextViews()
             }
             catch (Exception e)
             {
-                log.Error(e, "Exception in InlineReviewNavigationCommand.GetCurrentTextViews()");
+                log.Error(e, "Exception in InlineCommentNavigationCommand.GetCurrentTextViews()");
             }
 
             return result;
@@ -223,7 +223,7 @@ protected IReadOnlyList<ITagInfo> GetTags(IEnumerable<ITextView> textViews)
         /// <param name="parameter">The navigation parameter detailing a search from the specified tag</param>
         /// <param name="allTextViews">The full list of text views</param>
         protected void ShowPeekComments(
-            InlineReviewNavigationParams parameter,
+            InlineCommentNavigationParams parameter,
             ITextView textView,
             ShowInlineReviewTag tag,
             IEnumerable<ITextView> allTextViews)
diff --git a/src/GitHub.InlineReviews/Commands/NextInlineCommentCommand.cs b/src/GitHub.InlineReviews/Commands/NextInlineCommentCommand.cs
@@ -13,8 +13,8 @@ namespace GitHub.InlineReviews.Commands
     /// <summary>
     /// Navigates to and opens the the next inline review in the currently active text view.
     /// </summary>
-    [Export(typeof(INextInlineReviewCommand))]
-    class NextInlineReviewCommand : InlineReviewNavigationCommand, INextInlineReviewCommand
+    [Export(typeof(INextInlineCommentCommand))]
+    class NextInlineCommentCommand : InlineCommentNavigationCommand, INextInlineCommentCommand
     {
         /// <summary>
         /// Gets the GUID of the group the command belongs to.
@@ -27,13 +27,13 @@ class NextInlineReviewCommand : InlineReviewNavigationCommand, INextInlineReview
         public const int CommandId = PkgCmdIDList.NextInlineCommentId;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="NextInlineReviewCommand"/> class.
+        /// Initializes a new instance of the <see cref="NextInlineCommentCommand"/> 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 NextInlineReviewCommand(
+        protected NextInlineCommentCommand(
             IGitHubServiceProvider serviceProvider,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
             IInlineReviewPeekService peekService)
@@ -45,7 +45,7 @@ protected NextInlineReviewCommand(
         /// Executes the command.
         /// </summary>
         /// <returns>A task that tracks the execution of the command.</returns>
-        public override Task Execute(InlineReviewNavigationParams parameter)
+        public override Task Execute(InlineCommentNavigationParams parameter)
         {
             var textViews = GetCurrentTextViews().ToList();
             var tags = GetTags(textViews);
diff --git a/src/GitHub.InlineReviews/Commands/PreviousInlineCommentCommand.cs b/src/GitHub.InlineReviews/Commands/PreviousInlineCommentCommand.cs
@@ -14,7 +14,7 @@ namespace GitHub.InlineReviews.Commands
     /// Navigates to and opens the the previous inline review in the currently active text view.
     /// </summary>
     [Export(typeof(IPreviousInlineCommentCommand))]
-    class PreviousInlineReviewCommand : InlineReviewNavigationCommand, IPreviousInlineCommentCommand
+    class PreviousInlineCommentCommand : InlineCommentNavigationCommand, IPreviousInlineCommentCommand
     {
         /// <summary>
         /// Gets the GUID of the group the command belongs to.
@@ -27,13 +27,13 @@ class PreviousInlineReviewCommand : InlineReviewNavigationCommand, IPreviousInli
         public const int CommandId = PkgCmdIDList.PreviousInlineCommentId;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PreviousInlineReviewCommand"/> class.
+        /// Initializes a new instance of the <see cref="PreviousInlineCommentCommand"/> 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 PreviousInlineReviewCommand(
+        protected PreviousInlineCommentCommand(
             IGitHubServiceProvider serviceProvider,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
             IInlineReviewPeekService peekService)
@@ -45,7 +45,7 @@ protected PreviousInlineReviewCommand(
         /// Executes the command.
         /// </summary>
         /// <returns>A task that tracks the execution of the command.</returns>
-        public override Task Execute(InlineReviewNavigationParams parameter)
+        public override Task Execute(InlineCommentNavigationParams parameter)
         {
             var textViews = GetCurrentTextViews().ToList();
             var tags = GetTags(textViews);
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -71,9 +71,9 @@
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
     <Compile Include="Commands\ToggleInlineReviewMarginCommand.cs" />
-    <Compile Include="Commands\InlineReviewNavigationCommand.cs" />
-    <Compile Include="Commands\PreviousInlineReviewCommand.cs" />
-    <Compile Include="Commands\NextInlineReviewCommand.cs" />
+    <Compile Include="Commands\InlineCommentNavigationCommand.cs" />
+    <Compile Include="Commands\PreviousInlineCommentCommand.cs" />
+    <Compile Include="Commands\NextInlineCommentCommand.cs" />
     <Compile Include="Margins\InlineCommentTextViewOptions.cs" />
     <Compile Include="Margins\PullRequestFileMargin.cs" />
     <Compile Include="Margins\PullRequestFileMarginProvider.cs" />
@@ -137,8 +137,8 @@
     <Compile Include="Views\GlyphMarginGrid.xaml.cs">
       <DependentUpon>GlyphMarginGrid.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\InlineReviewPeekView.xaml.cs">
-      <DependentUpon>InlineReviewPeekView.xaml</DependentUpon>
+    <Compile Include="Views\InlineCommentPeekView.xaml.cs">
+      <DependentUpon>InlineCommentPeekView.xaml</DependentUpon>
     </Compile>
     <Compile Include="SampleData\CommentViewModelDesigner.cs" />
     <Compile Include="Services\DiffService.cs" />
@@ -476,7 +476,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\InlineReviewPeekView.xaml">
+    <Page Include="Views\InlineCommentPeekView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.cs b/src/GitHub.InlineReviews/InlineReviewsPackage.cs
@@ -48,7 +48,7 @@ async Task InitializeMenus()
             var exports = componentModel.DefaultExportProvider;
             var commands = new IVsCommandBase[]
             {
-                exports.GetExportedValue<INextInlineReviewCommand>(),
+                exports.GetExportedValue<INextInlineCommentCommand>(),
                 exports.GetExportedValue<IPreviousInlineCommentCommand>(),
                 exports.GetExportedValue<IToggleInlineReviewMarginCommand>()
             };
diff --git a/src/GitHub.InlineReviews/Peek/InlineCommentPeekResultPresentation.cs b/src/GitHub.InlineReviews/Peek/InlineCommentPeekResultPresentation.cs
@@ -10,7 +10,7 @@ class InlineCommentPeekResultPresentation : IPeekResultPresentation, IDesiredHei
     {
         const double PeekBorders = 28.0;
         readonly InlineReviewPeekViewModel viewModel;
-        InlineReviewPeekView view;
+        InlineCommentPeekView view;
         double desiredHeight;
 
         public bool IsDirty => false;
@@ -72,7 +72,7 @@ public void Close()
 
         public UIElement Create(IPeekSession session, IPeekResultScrollState scrollState)
         {
-            view = new InlineReviewPeekView();
+            view = new InlineCommentPeekView();
             view.DataContext = viewModel;
 
             // Report the desired size back to the peek view. Unfortunately the peek view
diff --git a/src/GitHub.InlineReviews/Peek/InlineCommentPeekableItemSource.cs b/src/GitHub.InlineReviews/Peek/InlineCommentPeekableItemSource.cs
@@ -14,19 +14,19 @@ class InlineCommentPeekableItemSource : IPeekableItemSource
     {
         readonly IInlineReviewPeekService peekService;
         readonly IPullRequestSessionManager sessionManager;
-        readonly INextInlineReviewCommand _nextReviewCommand;
+        readonly INextInlineCommentCommand _nextCommentCommand;
         readonly IPreviousInlineCommentCommand previousCommentCommand;
         readonly ICommentService commentService;
 
         public InlineCommentPeekableItemSource(IInlineReviewPeekService peekService,
             IPullRequestSessionManager sessionManager,
-            INextInlineReviewCommand nextReviewCommand,
+            INextInlineCommentCommand nextCommentCommand,
             IPreviousInlineCommentCommand previousCommentCommand,
             ICommentService commentService)
         {
             this.peekService = peekService;
             this.sessionManager = sessionManager;
-            this._nextReviewCommand = nextReviewCommand;
+            this._nextCommentCommand = nextCommentCommand;
             this.previousCommentCommand = previousCommentCommand;
             this.commentService = commentService;
         }
@@ -39,7 +39,7 @@ public void AugmentPeekSession(IPeekSession session, IList<IPeekableItem> peekab
                     peekService,
                     session,
                     sessionManager,
-                    _nextReviewCommand,
+                    _nextCommentCommand,
                     previousCommentCommand,
                     commentService);
                 viewModel.Initialize().Forget();
diff --git a/src/GitHub.InlineReviews/Peek/InlineCommentPeekableItemSourceProvider.cs b/src/GitHub.InlineReviews/Peek/InlineCommentPeekableItemSourceProvider.cs
@@ -18,21 +18,21 @@ class InlineCommentPeekableItemSourceProvider : IPeekableItemSourceProvider
     {
         readonly IInlineReviewPeekService peekService;
         readonly IPullRequestSessionManager sessionManager;
-        readonly INextInlineReviewCommand _nextReviewCommand;
+        readonly INextInlineCommentCommand _nextCommentCommand;
         readonly IPreviousInlineCommentCommand previousCommentCommand;
         readonly ICommentService commentService;
 
         [ImportingConstructor]
         public InlineCommentPeekableItemSourceProvider(
             IInlineReviewPeekService peekService,
             IPullRequestSessionManager sessionManager,
-            INextInlineReviewCommand nextReviewCommand,
+            INextInlineCommentCommand nextCommentCommand,
             IPreviousInlineCommentCommand previousCommentCommand,
             ICommentService commentService)
         {
             this.peekService = peekService;
             this.sessionManager = sessionManager;
-            this._nextReviewCommand = nextReviewCommand;
+            this._nextCommentCommand = nextCommentCommand;
             this.previousCommentCommand = previousCommentCommand;
             this.commentService = commentService;
         }
@@ -42,7 +42,7 @@ public IPeekableItemSource TryCreatePeekableItemSource(ITextBuffer textBuffer)
             return new InlineCommentPeekableItemSource(
                 peekService,
                 sessionManager,
-                _nextReviewCommand,
+                _nextCommentCommand,
                 previousCommentCommand,
                 commentService);
         }
diff --git a/src/GitHub.InlineReviews/ViewModels/InlineReviewPeekViewModel.cs b/src/GitHub.InlineReviews/ViewModels/InlineReviewPeekViewModel.cs
@@ -49,14 +49,14 @@ public sealed class InlineReviewPeekViewModel : ReactiveObject, IDisposable
         public InlineReviewPeekViewModel(IInlineReviewPeekService peekService,
             IPeekSession peekSession,
             IPullRequestSessionManager sessionManager,
-            INextInlineReviewCommand nextReviewCommand,
+            INextInlineCommentCommand nextCommentCommand,
             IPreviousInlineCommentCommand previousCommentCommand,
             ICommentService commentService)
         {
             Guard.ArgumentNotNull(peekService, nameof(peekService));
             Guard.ArgumentNotNull(peekSession, nameof(peekSession));
             Guard.ArgumentNotNull(sessionManager, nameof(sessionManager));
-            Guard.ArgumentNotNull(nextReviewCommand, nameof(nextReviewCommand));
+            Guard.ArgumentNotNull(nextCommentCommand, nameof(nextCommentCommand));
             Guard.ArgumentNotNull(previousCommentCommand, nameof(previousCommentCommand));
 
             this.peekService = peekService;
@@ -73,15 +73,15 @@ public InlineReviewPeekViewModel(IInlineReviewPeekService peekService,
                     : Observable.Never<Unit>());
 
             NextComment = ReactiveCommand.CreateAsyncTask(
-                Observable.Return(nextReviewCommand.Enabled),
-                _ => nextReviewCommand.Execute(new InlineReviewNavigationParams
+                Observable.Return(nextCommentCommand.Enabled),
+                _ => nextCommentCommand.Execute(new InlineCommentNavigationParams
                 {
                     FromLine = peekService.GetLineNumber(peekSession, triggerPoint).Item1,
                 }));
 
             PreviousComment = ReactiveCommand.CreateAsyncTask(
                 Observable.Return(previousCommentCommand.Enabled),
-                _ => previousCommentCommand.Execute(new InlineReviewNavigationParams
+                _ => previousCommentCommand.Execute(new InlineCommentNavigationParams
                 {
                     FromLine = peekService.GetLineNumber(peekSession, triggerPoint).Item1,
                 }));
diff --git a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="GitHub.InlineReviews.Views.InlineReviewPeekView"
+﻿<UserControl x:Class="GitHub.InlineReviews.Views.InlineCommentPeekView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml.cs b/src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml.cs
@@ -6,11 +6,11 @@
 namespace GitHub.InlineReviews.Views
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable")]
-    public partial class InlineReviewPeekView : UserControl
+    public partial class InlineCommentPeekView : UserControl
     {
         readonly Subject<double> desiredHeight;
 
-        public InlineReviewPeekView()
+        public InlineCommentPeekView()
         {
             InitializeComponent();
 
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
`@@ -254,7 +254,7 @@ public async Task<IDifferenceViewer> OpenDiff(IPullRequestSession session, strin`
`254`	`254`	`{`
`255`	`255`	`var diffViewer = await OpenDiff(session, relativePath, headSha, scrollToFirstDiff: false);`
`256`	`256`
`257`		`- var param = (object) new InlineReviewNavigationParams`
	`257`	`+ var param = (object) new InlineCommentNavigationParams`
`258`	`258`	`{`
`259`	`259`	`FromLine = fromLine,`
`260`	`260`	`};`
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 INextInlineReviewCommand : IVsCommand<InlineReviewNavigationParams>`
	`9`	`+ public interface INextInlineCommentCommand : IVsCommand<InlineCommentNavigationParams>`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`	`}`
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 previous inline comment thread in the currently active text view.`
`8`	`8`	`/// </summary>`
`9`		`- public interface IPreviousInlineCommentCommand : IVsCommand<InlineReviewNavigationParams>`
	`9`	`+ public interface IPreviousInlineCommentCommand : IVsCommand<InlineCommentNavigationParams>`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,10 @@`
`3`	`3`	`namespace GitHub.Commands`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`		`- /// Supplies parameters to <see cref="INextInlineReviewCommand"/> and`
	`6`	`+ /// Supplies parameters to <see cref="INextInlineCommentCommand"/> and`
`7`	`7`	`/// <see cref="IPreviousInlineCommentCommand"/>.`
`8`	`8`	`/// </summary>`
`9`		`- public class InlineReviewNavigationParams`
	`9`	`+ public class InlineCommentNavigationParams`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Gets or sets the line that should be used as the start point for navigation.`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ async Task InitializeMenus()`
`48`	`48`	`var exports = componentModel.DefaultExportProvider;`
`49`	`49`	`var commands = new IVsCommandBase[]`
`50`	`50`	`{`
`51`		`- exports.GetExportedValue<INextInlineReviewCommand>(),`
	`51`	`+ exports.GetExportedValue<INextInlineCommentCommand>(),`
`52`	`52`	`exports.GetExportedValue<IPreviousInlineCommentCommand>(),`
`53`	`53`	`exports.GetExportedValue<IToggleInlineReviewMarginCommand>()`
`54`	`54`	`};`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class InlineCommentPeekResultPresentation : IPeekResultPresentation, IDesiredHei`
`10`	`10`	`{`
`11`	`11`	`const double PeekBorders = 28.0;`
`12`	`12`	`readonly InlineReviewPeekViewModel viewModel;`
`13`		`- InlineReviewPeekView view;`
	`13`	`+ InlineCommentPeekView view;`
`14`	`14`	`double desiredHeight;`
`15`	`15`
`16`	`16`	`public bool IsDirty => false;`
`@@ -72,7 +72,7 @@ public void Close()`
`72`	`72`
`73`	`73`	`public UIElement Create(IPeekSession session, IPeekResultScrollState scrollState)`
`74`	`74`	`{`
`75`		`- view = new InlineReviewPeekView();`
	`75`	`+ view = new InlineCommentPeekView();`
`76`	`76`	`view.DataContext = viewModel;`
`77`	`77`
`78`	`78`	`// Report the desired size back to the peek view. Unfortunately the peek view`