WIP

Author: grokys

src/GitHub.Exports.Reactive/Models/IPullRequestSessionFile.cs

@@ -16,6 +16,12 @@ namespace GitHub.Models
     /// <seealso cref="IPullRequestSessionManager"/>
     public interface IPullRequestSessionFile : INotifyPropertyChanged
     {
+        /// <summary>
+        /// Gets an observable that is raised with a collection of 0-based line numbers when the
+        /// review comments on the file are changed.
+        /// </summary>
+        IObservable<IReadOnlyList<int>> LinesChanged { get; }
+
         /// <summary>
         /// Gets the SHA of the base commit of the file in the pull request.
         /// </summary>

src/GitHub.Exports.Reactive/Models/IPullRequestSessionLiveFile.cs

@@ -14,10 +14,5 @@ namespace GitHub.Models
     /// </remarks>
     public interface IPullRequestSessionLiveFile : IPullRequestSessionFile
     {
-        /// <summary>
-        /// Gets an observable that is raised with a collection of 0-based line numbers when the
-        /// review comments on the file are changed.
-        /// </summary>
-        IObservable<IReadOnlyList<int>> LinesChanged { get; }
     }
 }

src/GitHub.InlineReviews/Models/PullRequestSessionFile.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Reactive.Subjects;
 using GitHub.Models;
 using ReactiveUI;
 
@@ -17,6 +18,7 @@ namespace GitHub.InlineReviews.Models
     /// <seealso cref="PullRequestSessionManager"/>
     public class PullRequestSessionFile : ReactiveObject, IPullRequestSessionFile
     {
+        readonly Subject<IReadOnlyList<int>> linesChanged = new Subject<IReadOnlyList<int>>();
         IReadOnlyList<DiffChunk> diff;
         string commitSha;
         IReadOnlyList<IInlineCommentThreadModel> inlineCommentThreads;
@@ -58,5 +60,14 @@ public virtual IReadOnlyList<IInlineCommentThreadModel> InlineCommentThreads
             get { return inlineCommentThreads; }
             internal set { this.RaiseAndSetIfChanged(ref inlineCommentThreads, value); }
         }
+
+        /// <inheritdoc/>
+        public IObservable<IReadOnlyList<int>> LinesChanged => linesChanged;
+
+        /// <summary>
+        /// Raises the <see cref="LinesChanged"/> signal.
+        /// </summary>
+        /// <param name="lines">The lines that have changed.</param>
+        public void NotifyLinesChanged(IReadOnlyList<int> lines) => linesChanged.OnNext(lines);
     }
 }

src/GitHub.InlineReviews/Models/PullRequestSessionLiveFile.cs

@@ -17,8 +17,6 @@ namespace GitHub.InlineReviews.Models
     /// </remarks>
     public sealed class PullRequestSessionLiveFile : PullRequestSessionFile, IPullRequestSessionLiveFile, IDisposable
     {
-        readonly Subject<IReadOnlyList<int>> linesChanged = new Subject<IReadOnlyList<int>>();
-
         public PullRequestSessionLiveFile(
             string relativePath,
             ITextBuffer textBuffer,
@@ -49,9 +47,6 @@ public PullRequestSessionLiveFile(
         /// </summary>
         public ISubject<ITextSnapshot, ITextSnapshot> Rebuild { get; }
 
-        /// <inheritdoc/>
-        public IObservable<IReadOnlyList<int>> LinesChanged => linesChanged;
-
         /// <inheritdoc/>
         public override IReadOnlyList<IInlineCommentThreadModel> InlineCommentThreads
         {
@@ -77,11 +72,5 @@ public void Dispose()
             ToDispose?.Dispose();
             ToDispose = null;
         }
-
-        /// <summary>
-        /// Raises the <see cref="LinesChanged"/> signal.
-        /// </summary>
-        /// <param name="lines">The lines that have changed.</param>
-        public void NotifyLinesChanged(IReadOnlyList<int> lines) => linesChanged.OnNext(lines);
     }
 }

test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj

@@ -107,6 +107,7 @@
     <Compile Include="Models\DiffUtilitiesTests.cs" />
     <Compile Include="Services\PullRequestSessionManagerTests.cs" />
     <Compile Include="Services\PullRequestSessionServiceTests.cs" />
+    <Compile Include="Tags\InlineCommentTaggerTests.cs" />
     <Compile Include="TestDoubles\FakeDiffService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">

test/GitHub.InlineReviews.UnitTests/Tags/InlineCommentTaggerTests.cs

@@ -131,7 +131,29 @@ public void ShouldReturnAddCommentTagForLhs()
                 Assert.IsType<AddInlineCommentTag>(result[0].Tag);
             }
 
-            static IPullRequestSessionManager CreateSessionManager(bool leftHandSide)
+            [Fact]
+            public void ShouldRaiseTagsChangedOnThreadAddition()
+            {
+                var file = CreateSessionFile();
+                var target = new InlineCommentTagger(
+                    Substitute.For<IGitService>(),
+                    Substitute.For<IGitClient>(),
+                    Substitute.For<IDiffService>(),
+                    Substitute.For<ITextView>(),
+                    Substitute.For<ITextBuffer>(),
+                    CreateSessionManager(file, leftHandSide: false));
+
+                var span = CreateSpan(14);
+                var firstPass = target.GetTags(span);
+                var result = target.GetTags(span).ToList();
+                var raised = false;
+
+                target.TagsChanged += (s, e) => raised = e.Span.Start == 14;
+
+                Assert.True(raised);
+            }
+
+            static IPullRequestSessionFile CreateSessionFile()
             {
                 var diffChunk = new DiffChunk
                 {
@@ -161,6 +183,19 @@ static IPullRequestSessionManager CreateSessionManager(bool leftHandSide)
                 file.Diff.Returns(diff);
                 file.InlineCommentThreads.Returns(threads);
 
+                return file;
+            }
+
+            static IPullRequestSessionManager CreateSessionManager(bool leftHandSide)
+            {
+                var file = CreateSessionFile();
+                return CreateSessionManager(file, leftHandSide);
+            }
+
+            static IPullRequestSessionManager CreateSessionManager(
+                IPullRequestSessionFile file,
+                bool leftHandSide)
+            {
                 var session = Substitute.For<IPullRequestSession>();
                 session.GetFile("file.cs").Returns(file);