Rename CommentsMargin V/M to PullRequestFileMargin

Author: jcansdale

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -106,7 +106,7 @@
     <Compile Include="Services\PullRequestSessionManager.cs" />
     <Compile Include="Margins\InlineCommentMarginProvider.cs" />
     <Compile Include="Services\PullRequestSessionService.cs" />
-    <Compile Include="ViewModels\CommentsMarginViewModel.cs" />
+    <Compile Include="ViewModels\PullRequestFileMarginViewModel.cs" />
     <Compile Include="ViewModels\CommentViewModel.cs" />
     <Compile Include="ViewModels\ICommentThreadViewModel.cs" />
     <Compile Include="ViewModels\CommentThreadViewModel.cs" />
@@ -115,8 +115,8 @@
     <Compile Include="ViewModels\NewInlineCommentThreadViewModel.cs" />
     <Compile Include="ViewModels\PullRequestReviewCommentViewModel.cs" />
     <Compile Include="ViewModels\PullRequestStatusViewModel.cs" />
-    <Compile Include="Views\CommentsMarginView.xaml.cs">
-      <DependentUpon>CommentsMarginView.xaml</DependentUpon>
+    <Compile Include="Views\PullRequestFileMarginView.xaml.cs">
+      <DependentUpon>PullRequestFileMarginView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\GlyphMarginGrid.xaml.cs">
       <DependentUpon>GlyphMarginGrid.xaml</DependentUpon>
@@ -430,7 +430,7 @@
       <SubType>Designer</SubType>
       <ContainsDesignTimeResources>true</ContainsDesignTimeResources>
     </Page>
-    <Page Include="Views\CommentsMarginView.xaml">
+    <Page Include="Views\PullRequestFileMarginView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

src/GitHub.InlineReviews/Margins/PullRequestFileMargin.cs

@@ -24,8 +24,8 @@ internal class PullRequestFileMargin : IWpfTextViewMargin
         public const string MarginName = "PullRequestFileMargin";
 
         readonly IWpfTextView textView;
-        readonly CommentsMarginViewModel viewModel;
-        readonly CommentsMarginView visualElement;
+        readonly PullRequestFileMarginViewModel viewModel;
+        readonly PullRequestFileMarginView visualElement;
         readonly IPullRequestSessionManager sessionManager;
 
         bool isDisposed;
@@ -43,8 +43,8 @@ public PullRequestFileMargin(
             this.textView = textView;
             this.sessionManager = sessionManager;
 
-            viewModel = new CommentsMarginViewModel(toggleInlineCommentMarginCommand, goToSolutionOrPullRequestFileCommand);
-            visualElement = new CommentsMarginView { DataContext = viewModel, ClipToBounds = true };
+            viewModel = new PullRequestFileMarginViewModel(toggleInlineCommentMarginCommand, goToSolutionOrPullRequestFileCommand);
+            visualElement = new PullRequestFileMarginView { DataContext = viewModel, ClipToBounds = true };
 
             visibilitySubscription = viewModel.WhenAnyValue(x => x.Enabled).Subscribe(enabled =>
             {

…ws/ViewModels/CommentsMarginViewModel.cs …Models/PullRequestFileMarginViewModel.cssrc/GitHub.InlineReviews/ViewModels/CommentsMarginViewModel.cs renamed to src/GitHub.InlineReviews/ViewModels/PullRequestFileMarginViewModel.cs src/GitHub.InlineReviews/ViewModels/CommentsMarginViewModel.cs renamed to src/GitHub.InlineReviews/ViewModels/PullRequestFileMarginViewModel.cs

@@ -3,14 +3,14 @@
 
 namespace GitHub.InlineReviews.ViewModels
 {
-    public class CommentsMarginViewModel : ReactiveObject
+    public class PullRequestFileMarginViewModel : ReactiveObject
     {
         bool enabled;
         string fileName;
         int commentsInFile;
         bool marginEnabled;
 
-        public CommentsMarginViewModel(ICommand toggleInlineCommentMarginCommand, ICommand viewChangesCommand)
+        public PullRequestFileMarginViewModel(ICommand toggleInlineCommentMarginCommand, ICommand viewChangesCommand)
         {
             ToggleInlineCommentMarginCommand = toggleInlineCommentMarginCommand;
             ViewChangesCommand = viewChangesCommand;

src/GitHub.InlineReviews/Views/CommentsMarginView.xaml.cs

@@ -1,4 +1,4 @@
-<UserControl x:Class="GitHub.InlineReviews.Views.CommentsMarginView"
+<UserControl x:Class="GitHub.InlineReviews.Views.PullRequestFileMarginView"
              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" 

…ineReviews/Views/CommentsMarginView.xaml …ews/Views/PullRequestFileMarginView.xamlsrc/GitHub.InlineReviews/Views/CommentsMarginView.xaml renamed to src/GitHub.InlineReviews/Views/PullRequestFileMarginView.xaml src/GitHub.InlineReviews/Views/CommentsMarginView.xaml renamed to src/GitHub.InlineReviews/Views/PullRequestFileMarginView.xaml

@@ -0,0 +1,13 @@
+using System;
+using System.Windows.Controls;
+
+namespace GitHub.InlineReviews.Views
+{
+    public partial class PullRequestFileMarginView : UserControl
+    {
+        public PullRequestFileMarginView()
+        {
+            InitializeComponent();
+        }
+    }
+}