Bug found in #1789

- Added functionality to InlineCommentPeekViewModel to listen to the CancelEdit command of every assigned NewInlineCommentThreadViewModel
- Added functionality to the InlineCommentPeekService to dismiss the session when that event is fired

Co-authored-by: Steven Kirk <[email protected]>

Author: StanleyGoldman

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -191,6 +191,10 @@
       <Project>{9aea02db-02b5-409c-b0ca-115d05331a6b}</Project>
       <Name>GitHub.Exports</Name>
     </ProjectReference>
+    <ProjectReference Include="..\GitHub.Extensions.Reactive\GitHub.Extensions.Reactive.csproj">
+      <Project>{6559E128-8B40-49A5-85A8-05565ED0C7E3}</Project>
+      <Name>GitHub.Extensions.Reactive</Name>
+    </ProjectReference>
     <ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj">
       <Project>{6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}</Project>
       <Name>GitHub.Extensions</Name>

src/GitHub.InlineReviews/Services/InlineCommentPeekService.cs

@@ -107,12 +107,7 @@ public ITrackingPoint Show(ITextView textView, AddInlineCommentTag tag)
 
             var session = peekBroker.TriggerPeekSession(options);
             var item = session.PeekableItems.OfType<InlineCommentPeekableItem>().FirstOrDefault();
-
-            if (item != null)
-            {
-                var placeholder = item.ViewModel.Thread.Comments.Last();
-                placeholder.CancelEdit.Take(1).Subscribe(_ => session.Dismiss());
-            }
+            item?.ViewModel.Close.Take(1).Subscribe(_ => session.Dismiss());
 
             return trackingPoint;
         }
@@ -134,7 +129,9 @@ public ITrackingPoint Show(ITextView textView, ShowInlineCommentTag tag)
 
             ExpandCollapsedRegions(textView, line.Extent);
 
-            peekBroker.TriggerPeekSession(options);
+            var session = peekBroker.TriggerPeekSession(options);
+            var item = session.PeekableItems.OfType<InlineCommentPeekableItem>().FirstOrDefault();
+            item?.ViewModel.Close.Take(1).Subscribe(_ => session.Dismiss());
 
             return trackingPoint;
         }

src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs

@@ -7,6 +7,7 @@
 using GitHub.Api;
 using GitHub.Commands;
 using GitHub.Extensions;
+using GitHub.Extensions.Reactive;
 using GitHub.Factories;
 using GitHub.InlineReviews.Commands;
 using GitHub.InlineReviews.Services;
@@ -63,6 +64,11 @@ public InlineCommentPeekViewModel(
 
             peekSession.Dismissed += (s, e) => Dispose();
 
+            Close = this.WhenAnyValue(x => x.Thread)
+                .SelectMany(x => x is NewInlineCommentThreadViewModel
+                    ? x.Comments.Single().CancelEdit.SelectUnit()
+                    : Observable.Never<Unit>());
+
             NextComment = ReactiveCommand.CreateAsyncTask(
                 Observable.Return(nextCommentCommand.Enabled),
                 _ => nextCommentCommand.Execute(new InlineCommentNavigationParams
@@ -97,6 +103,8 @@ public ICommentThreadViewModel Thread
         /// </summary>
         public ReactiveCommand<Unit> PreviousComment { get; }
 
+        public IObservable<Unit> Close { get; }
+
         public void Dispose()
         {
             threadSubscription?.Dispose();