Merge branch 'master' into fixes/culture-null

Author: jcansdale

src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj

@@ -104,7 +104,6 @@
     <Compile Include="Models\IAvatarContainer.cs" />
     <Compile Include="Models\IConnectionRepositoryHostMap.cs" />
     <Compile Include="Models\IInlineCommentThreadModel.cs" />
-    <Compile Include="Models\IPullRequestSessionLiveFile.cs" />
     <Compile Include="Models\IPullRequestSessionFile.cs" />
     <Compile Include="Models\IRepositoryHosts.cs" />
     <Compile Include="Models\PullRequestTextBufferInfo.cs" />

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

@@ -4,6 +4,12 @@
 
 namespace GitHub.Models
 {
+    public enum DiffSide
+    {
+        Right,
+        Left,
+    }
+
     /// <summary>
     /// Represents a file in a pull request.
     /// </summary>
@@ -41,5 +47,11 @@ public interface IPullRequestSessionFile : INotifyPropertyChanged
         /// Gets the inline comments threads for the file.
         /// </summary>
         IReadOnlyList<IInlineCommentThreadModel> InlineCommentThreads { get; }
+
+        /// <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<Tuple<int, DiffSide>>> LinesChanged { get; }
     }
 }

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

@@ -15,17 +15,15 @@ public class PullRequestTextBufferInfo
         /// </summary>
         /// <param name="session">The pull request session.</param>
         /// <param name="relativePath">The relative path to the file in the repository.</param>
-        /// <param name="isLeftComparisonBuffer">
-        /// Whether the buffer represents the left-hand-side of a comparison.
-        /// </param>
+        /// <param name="side">Which side of a diff comparision the buffer represents.</param>
         public PullRequestTextBufferInfo(
             IPullRequestSession session,
             string relativePath,
-            bool isLeftComparisonBuffer)
+            DiffSide? side)
         {
             Session = session;
             RelativePath = relativePath;
-            IsLeftComparisonBuffer = isLeftComparisonBuffer;
+            Side = side;
         }
 
         /// <summary>
@@ -39,8 +37,8 @@ public PullRequestTextBufferInfo(
         public string RelativePath { get; }
 
         /// <summary>
-        /// Gets a value indicating whether the buffer represents the left-hand-side of a comparison.
+        /// Gets a value indicating which side of a diff comparision the buffer represents.
         /// </summary>
-        public bool IsLeftComparisonBuffer { get; }
+        public DiffSide? Side { get; }
     }
 }

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

@@ -25,6 +25,16 @@ public interface IPullRequestSession
         /// </summary>
         IPullRequestModel PullRequest { get; }
 
+        /// <summary>
+        /// Gets an observable that indicates that<see cref="PullRequest"/> has been updated.
+        /// </summary>
+        /// <remarks>
+        /// This notification is different to listening for a PropertyChanged event because the
+        /// pull request model may be updated in-place which will not result in a PropertyChanged
+        /// notification.
+        /// </remarks>
+        IObservable<IPullRequestModel> PullRequestChanged { get; }
+
         /// <summary>
         /// Gets the local repository.
         /// </summary>

src/GitHub.Exports.Reactive/Services/IPullRequestSession.cs

@@ -38,7 +38,7 @@ public interface IPullRequestSessionManager : INotifyPropertyChanged
         /// <param name="textView">The text view that is showing the file.</param>
         /// <param name="textBuffer">The text buffer with the file contents.</param>
         /// <returns>An <see cref="IPullRequestSessionLiveFile"/>.</returns>
-        Task<IPullRequestSessionLiveFile> GetLiveFile(
+        Task<IPullRequestSessionFile> GetLiveFile(
             string relativePath,
             ITextView textView,
             ITextBuffer textBuffer);

src/GitHub.Exports.Reactive/Services/IPullRequestSessionManager.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Subjects;
 using GitHub.Models;
 using ReactiveUI;
 
@@ -17,6 +19,7 @@ namespace GitHub.InlineReviews.Models
     /// <seealso cref="PullRequestSessionManager"/>
     public class PullRequestSessionFile : ReactiveObject, IPullRequestSessionFile
     {
+        readonly Subject<IReadOnlyList<Tuple<int, DiffSide>>> linesChanged = new Subject<IReadOnlyList<Tuple<int, DiffSide>>>();
         IReadOnlyList<DiffChunk> diff;
         string commitSha;
         IReadOnlyList<IInlineCommentThreadModel> inlineCommentThreads;
@@ -53,10 +56,29 @@ public string CommitSha
         }
 
         /// <inheritdoc/>
-        public virtual IReadOnlyList<IInlineCommentThreadModel> InlineCommentThreads
+        public IReadOnlyList<IInlineCommentThreadModel> InlineCommentThreads
         {
             get { return inlineCommentThreads; }
-            internal set { this.RaiseAndSetIfChanged(ref inlineCommentThreads, value); }
+            set
+            {
+                var lines = (inlineCommentThreads ?? Enumerable.Empty<IInlineCommentThreadModel>())?
+                    .Concat(value ?? Enumerable.Empty<IInlineCommentThreadModel>())
+                    .Select(x => Tuple.Create(x.LineNumber, x.DiffLineType == DiffChangeType.Delete ? DiffSide.Left : DiffSide.Right))
+                    .Where(x => x.Item1 >= 0)
+                    .Distinct()
+                    .ToList();
+                inlineCommentThreads = value;
+                NotifyLinesChanged(lines);
+            }
         }
+
+        /// <inheritdoc/>
+        public IObservable<IReadOnlyList<Tuple<int, DiffSide>>> LinesChanged => linesChanged;
+
+        /// <summary>
+        /// Raises the <see cref="LinesChanged"/> signal.
+        /// </summary>
+        /// <param name="lines">The lines that have changed.</param>
+        public void NotifyLinesChanged(IReadOnlyList<Tuple<int, DiffSide>> lines) => linesChanged.OnNext(lines);
     }
 }

src/GitHub.InlineReviews/Models/PullRequestSessionFile.cs

@@ -11,14 +11,12 @@ namespace GitHub.InlineReviews.Models
     /// A file in a pull request session that tracks editor content.
     /// </summary>
     /// <remarks>
-    /// A live session file extends <see cref="IPullRequestSessionFile"/> to update the file's
+    /// A live session file extends <see cref="PullRequestSessionFile"/> to update the file's
     /// review comments in real time, based on the contents of an editor and
     /// <see cref="IPullRequestSessionManager.CurrentSession"/>.
     /// </remarks>
-    public sealed class PullRequestSessionLiveFile : PullRequestSessionFile, IPullRequestSessionLiveFile, IDisposable
+    public sealed class PullRequestSessionLiveFile : PullRequestSessionFile, IDisposable
     {
-        readonly Subject<IReadOnlyList<int>> linesChanged = new Subject<IReadOnlyList<int>>();
-
         public PullRequestSessionLiveFile(
             string relativePath,
             ITextBuffer textBuffer,
@@ -49,26 +47,6 @@ public PullRequestSessionLiveFile(
         /// </summary>
         public ISubject<ITextSnapshot, ITextSnapshot> Rebuild { get; }
 
-        /// <inheritdoc/>
-        public IObservable<IReadOnlyList<int>> LinesChanged => linesChanged;
-
-        /// <inheritdoc/>
-        public override IReadOnlyList<IInlineCommentThreadModel> InlineCommentThreads
-        {
-            get { return base.InlineCommentThreads; }
-            internal set
-            {
-                var lines = base.InlineCommentThreads?
-                    .Concat(value ?? Enumerable.Empty<IInlineCommentThreadModel>())
-                    .Select(x => x.LineNumber)
-                    .Where(x => x >= 0)
-                    .Distinct()
-                    .ToList();
-                base.InlineCommentThreads = value;
-                NotifyLinesChanged(lines);
-            }
-        }
-
         /// <summary>
         /// Disposes of the resources in <see cref="ToDispose"/>.
         /// </summary>
@@ -77,11 +55,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);
     }
 }

src/GitHub.InlineReviews/Models/PullRequestSessionLiveFile.cs

@@ -64,7 +64,7 @@ IReadOnlyList<IInlineCommentThreadModel> BuildCommentThreads(
         /// <returns>
         /// A collection of updated line numbers.
         /// </returns>
-        IReadOnlyList<int> UpdateCommentThreads(
+        IReadOnlyList<Tuple<int, DiffSide>> UpdateCommentThreads(
             IReadOnlyList<IInlineCommentThreadModel> threads,
             IReadOnlyList<DiffChunk> diff);
 

src/GitHub.InlineReviews/Services/IPullRequestSessionService.cs

@@ -9,6 +9,7 @@
 using GitHub.Services;
 using ReactiveUI;
 using System.Threading;
+using System.Reactive.Subjects;
 
 namespace GitHub.InlineReviews.Services
 {
@@ -30,6 +31,7 @@ public class PullRequestSession : ReactiveObject, IPullRequestSession
         string mergeBase;
         IReadOnlyList<IPullRequestSessionFile> files;
         IPullRequestModel pullRequest;
+        Subject<IPullRequestModel> pullRequestChanged = new Subject<IPullRequestModel>();
 
         public PullRequestSession(
             IPullRequestSessionService service,
@@ -155,6 +157,8 @@ public async Task Update(IPullRequestModel pullRequest)
             {
                 await UpdateFile(file);
             }
+
+            pullRequestChanged.OnNext(pullRequest);
         }
 
         async Task AddComment(IPullRequestReviewCommentModel comment)
@@ -233,6 +237,9 @@ private set
             }
         }
 
+        /// <inheritdoc/>
+        public IObservable<IPullRequestModel> PullRequestChanged => pullRequestChanged;
+
         /// <inheritdoc/>
         public ILocalRepositoryModel LocalRepository { get; }