Merge pull request #1034 from github/fixes/cancel-closes-new-comment

Close peek session when Cancel clicked on new inline comment thead.

Author: jcansdale

src/GitHub.InlineReviews/Peek/InlineCommentPeekableItem.cs

@@ -7,20 +7,19 @@ namespace GitHub.InlineReviews.Peek
 {
     class InlineCommentPeekableItem : IPeekableItem
     {
-        readonly InlineCommentPeekViewModel viewModel;
-
         public InlineCommentPeekableItem(InlineCommentPeekViewModel viewModel)
         {
-            this.viewModel = viewModel;
+            ViewModel = viewModel;
         }
 
         public string DisplayName => "GitHub Code Review";
+        public InlineCommentPeekViewModel ViewModel { get; }
 
         public IEnumerable<IPeekRelationship> Relationships => new[] { InlineCommentPeekRelationship.Instance };
 
         public IPeekResultSource GetOrCreateResultSource(string relationshipName)
         {
-            return new InlineCommentPeekableResultSource(viewModel);
+            return new InlineCommentPeekableResultSource(ViewModel);
         }
     }
 }

src/GitHub.InlineReviews/Services/InlineCommentPeekService.cs

@@ -1,5 +1,7 @@
 using System;
 using System.ComponentModel.Composition;
+using System.Linq;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using GitHub.Api;
 using GitHub.Extensions;
@@ -96,7 +98,15 @@ public ITrackingPoint Show(ITextView textView, AddInlineCommentTag tag)
 
             ExpandCollapsedRegions(textView, line.Extent);
 
-            peekBroker.TriggerPeekSession(textView, trackingPoint, InlineCommentPeekRelationship.Instance.Name);
+            var session = peekBroker.TriggerPeekSession(textView, trackingPoint, InlineCommentPeekRelationship.Instance.Name);
+            var item = session.PeekableItems.OfType<InlineCommentPeekableItem>().FirstOrDefault();
+
+            if (item != null)
+            {
+                var placeholder = item.ViewModel.Thread.Comments.Last();
+                placeholder.CancelEdit.Take(1).Subscribe(_ => session.Dismiss());
+            }
+
             return trackingPoint;
         }