Fix up comment view models after merge.

Author: grokys

src/GitHub.App/SampleData/Documents/IssueishCommentThreadViewModelDesigner.cs

@@ -10,10 +10,10 @@ namespace GitHub.SampleData.Documents
     public class IssueishCommentThreadViewModelDesigner : ViewModelBase, IIssueishCommentThreadViewModel
     {
         public IActorViewModel CurrentUser { get; } = new ActorViewModelDesigner("grokys");
-        public Task DeleteComment(int pullRequestId, int commentId) => Task.CompletedTask;
-        public Task EditComment(string id, string body) => Task.CompletedTask;
         public Task InitializeAsync(ActorModel currentUser, IssueishDetailModel model, bool addPlaceholder) => Task.CompletedTask;
-        public Task PostComment(string body) => Task.CompletedTask;
-        public Task CloseIssueish(string body) => Task.CompletedTask;
+        public Task DeleteComment(ICommentViewModel comment) => Task.CompletedTask;
+        public Task EditComment(ICommentViewModel comment) => Task.CompletedTask;
+        public Task PostComment(ICommentViewModel comment) => Task.CompletedTask;
+        public Task CloseIssueish(ICommentViewModel comment) => Task.CompletedTask;
     }
 }

src/GitHub.App/ViewModels/CommentThreadViewModel.cs

@@ -65,15 +65,13 @@ public CommentThreadViewModel(
         public abstract Task DeleteComment(ICommentViewModel comment);
 
         /// <summary>
-        /// Adds a placeholder comment that will allow the user to enter a reply, and wires up
+        /// Initializes a placeholder comment that will allow the user to enter a reply, and wires up
         /// event listeners for saving drafts.
         /// </summary>
         /// <param name="placeholder">The placeholder comment view model.</param>
         /// <returns>An object which when disposed will remove the event listeners.</returns>
-        protected IDisposable AddPlaceholder(ICommentViewModel placeholder)
+        protected IDisposable InitializePlaceholder(ICommentViewModel placeholder)
         {
-            Comments.Add(placeholder);
-
             return placeholder.WhenAnyValue(
                 x => x.EditState,
                 x => x.Body,

src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs

@@ -108,25 +108,25 @@ await placeholder.InitializeAsync(
         }
 
         /// <inheritdoc/>
-        public async Task PostComment(string body)
+        public async Task PostComment(ICommentViewModel comment)
         {
             var address = HostAddress.Create(Repository.CloneUrl);
-            var comment = await service.PostComment(address, Id, body).ConfigureAwait(true);
-            await AddComment(comment).ConfigureAwait(true);
+            var result = await service.PostComment(address, Id, comment.Body).ConfigureAwait(true);
+            await AddComment(result).ConfigureAwait(true);
             ClearPlaceholder();
         }
 
-        Task ICommentThreadViewModel.DeleteComment(int pullRequestId, int commentId)
+        Task ICommentThreadViewModel.DeleteComment(ICommentViewModel comment)
         {
             throw new NotImplementedException();
         }
 
-        Task ICommentThreadViewModel.EditComment(string id, string body)
+        Task ICommentThreadViewModel.EditComment(ICommentViewModel comment)
         {
             throw new NotImplementedException();
         }
 
-        Task IIssueishCommentThreadViewModel.CloseIssueish(string body)
+        Task IIssueishCommentThreadViewModel.CloseIssueish(ICommentViewModel comment)
         {
             throw new NotImplementedException();
         }

src/GitHub.App/ViewModels/PullRequestReviewCommentThreadViewModel.cs

@@ -128,7 +128,8 @@ await vm.InitializeAsPlaceholderAsync(
                     vm.Body = draft.Body;
                 }
 
-                AddPlaceholder(vm);
+                InitializePlaceholder(vm);
+                comments.Add(vm);
             }
         }
 
@@ -161,7 +162,8 @@ public async Task InitializeNewAsync(
                 vm.Body = draft.Body;
             }
 
-            AddPlaceholder(vm);
+            InitializePlaceholder(vm);
+            comments.Add(vm);
         }
 
         public override async Task PostComment(ICommentViewModel comment)

src/GitHub.Exports.Reactive/ViewModels/Documents/IIssueishCommentThreadViewModel.cs

@@ -11,7 +11,7 @@ public interface IIssueishCommentThreadViewModel : ICommentThreadViewModel
         /// <summary>
         /// Called by a comment in the thread to close the issue or pull request.
         /// </summary>
-        /// <param name="body">The body of a comment to submit before closing.</param>
-        Task CloseIssueish(string body);
+        /// <param name="body">The comment requesting the close.</param>
+        Task CloseIssueish(ICommentViewModel comment);
     }
 }

test/GitHub.App.UnitTests/ViewModels/CommentThreadViewModelTests.cs

@@ -8,6 +8,7 @@
 using GitHub.ViewModels;
 using NSubstitute;
 using NUnit.Framework;
+using ReactiveUI;
 using ReactiveUI.Testing;
 
 namespace GitHub.App.UnitTests.ViewModels
@@ -90,13 +91,17 @@ class Target : CommentThreadViewModel
             public Target(IMessageDraftStore drafts, IScheduler scheduler)
                 : base(drafts, scheduler)
             {
+                Comments = new ReactiveList<ICommentViewModel>();
             }
 
+            public ReactiveList<ICommentViewModel> Comments { get; }
+
             public async Task AddPlaceholder(bool isEditing)
             {
                 var c = new TestComment();
                 await c.InitializeAsPlaceholderAsync(this, isEditing);
-                AddPlaceholder(c);
+                InitializePlaceholder(c);
+                Comments.Add(c);
             }
 
             public override Task DeleteComment(ICommentViewModel comment) => Task.CompletedTask;