Remove NewInlineCommentThreadViewModel.Finished

Instead listen to `LinesChanged` to decide when to update the thread.

Author: grokys

src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
@@ -13,6 +14,7 @@
 using GitHub.Services;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
+using NLog;
 using ReactiveUI;
 
 namespace GitHub.InlineReviews.ViewModels
@@ -22,6 +24,7 @@ namespace GitHub.InlineReviews.ViewModels
     /// </summary>
     public sealed class InlineCommentPeekViewModel : ReactiveObject, IDisposable
     {
+        static readonly Logger log = LogManager.GetCurrentClassLogger();
         readonly IApiClientFactory apiClientFactory;
         readonly IInlineCommentPeekService peekService;
         readonly IPeekSession peekSession;
@@ -129,7 +132,25 @@ public async Task Initialize()
                     .Subscribe(x => SessionChanged(x).Forget());
             }
 
-            fileSubscription = file.WhenAnyValue(x => x.InlineCommentThreads).Subscribe(_ => UpdateThread().Forget());
+            fileSubscription?.Dispose();
+            fileSubscription = file.LinesChanged.Subscribe(LinesChanged);
+        }
+
+        async void LinesChanged(IReadOnlyList<int> lines)
+        {
+            try
+            {
+                var lineNumber = peekService.GetLineNumber(peekSession, triggerPoint).Item1;
+
+                if (lines.Contains(lineNumber))
+                {
+                    await UpdateThread();
+                }
+            }
+            catch (Exception e)
+            {
+                log.Error("Error updating InlineCommentViewModel", e);
+            }
         }
 
         async Task UpdateThread()
@@ -156,7 +177,6 @@ async Task UpdateThread()
             else
             {
                 var newThread = new NewInlineCommentThreadViewModel(session, file, lineNumber, leftBuffer);
-                threadSubscription = newThread.Finished.Subscribe(_ => UpdateThread().Forget());
                 Thread = newThread;
             }
 

src/GitHub.InlineReviews/ViewModels/NewInlineCommentThreadViewModel.cs

@@ -76,12 +76,6 @@ public NewInlineCommentThreadViewModel(
         /// </summary>
         public IPullRequestSession Session { get; }
 
-        /// <summary>
-        /// Gets an observable that is fired with a single value when a comment is sucessfully
-        /// posted and therefore this is no loner a new comment thread.
-        /// </summary>
-        public IObservable<Unit> Finished => finished;
-
         /// <summary>
         /// Gets a value indicating whether the user must commit and push their changes before
         /// leaving a comment on the requested line.

test/GitHub.InlineReviews.UnitTests/ViewModels/InlineCommentPeekViewModelTests.cs

@@ -3,6 +3,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Reactive.Subjects;
 using System.Threading.Tasks;
 using GitHub.Api;
 using GitHub.Factories;
@@ -98,6 +99,7 @@ public async Task SwitchesFromNewThreadToExistingThreadWhenCommentPosted()
                         peekSession.TextView.TextBuffer);
                     var newThread = CreateThread(8, "New Comment");
                     file.InlineCommentThreads.Returns(new[] { newThread });
+                    RaiseLinesChanged(file, 8);
                 });
 
             await target.Thread.Comments[0].CommitEdit.ExecuteAsyncTask(null);
@@ -211,7 +213,7 @@ void AddCommentToExistingThread(IPullRequestSessionFile file)
             var newComments = thread.Comments.Concat(new[] { newComment }).ToList();
             thread.Comments.Returns(newComments);
             file.InlineCommentThreads.Returns(newThreads);
-            RaisePropertyChanged(file, nameof(file.InlineCommentThreads));
+            RaiseLinesChanged(file, thread.LineNumber);
         }
 
         IApiClientFactory CreateApiClientFactory()
@@ -289,6 +291,7 @@ IPullRequestSessionManager CreateSessionManager(string commitSha = "COMMIT")
             file.CommitSha.Returns(commitSha);
             file.Diff.Returns(new[] { diff });
             file.InlineCommentThreads.Returns(new[] { thread });
+            file.LinesChanged.Returns(new Subject<IReadOnlyList<int>>());
 
             var session = Substitute.For<IPullRequestSession>();
             session.LocalRepository.CloneUrl.Returns(new UriString("https://foo.bar"));
@@ -301,6 +304,12 @@ IPullRequestSessionManager CreateSessionManager(string commitSha = "COMMIT")
             return result;
         }
 
+        void RaiseLinesChanged(IPullRequestSessionFile file, params int[] lineNumbers)
+        {
+            var subject = (Subject<IReadOnlyList<int>>)file.LinesChanged;
+            subject.OnNext(lineNumbers);
+        }
+
         void RaisePropertyChanged<T>(T o, string propertyName)
             where T : INotifyPropertyChanged
         {

test/GitHub.InlineReviews.UnitTests/ViewModels/NewInlineCommentThreadViewModelTests.cs

@@ -119,23 +119,6 @@ public void AddsCommentToCorrectDeletedLine()
                 7);
         }
 
-        [Fact]
-        public void SignalsFinishedWhenCommentPosted()
-        {
-            var session = CreateSession();
-            var file = CreateFile();
-            var target = new NewInlineCommentThreadViewModel(session, file, 10, false);
-            var signalled = false;
-
-            target.Finished.Subscribe(_ => signalled = true);
-            Assert.False(signalled);
-
-            target.Comments[0].Body = "New Comment";
-            target.Comments[0].CommitEdit.Execute(null);
-
-            Assert.True(signalled);
-        }
-
         IApiClient CreateApiClient()
         {
             var result = Substitute.For<IApiClient>();