Merge pull request #2407 from github/fixes/2382-inline-tagger-leaking-editor-instances

Stop inline comments tagger from leaking editor instances

Author: jcansdale

src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs

@@ -7,7 +7,6 @@
 using Microsoft.VisualStudio.Text.Classification;
 using GitHub.Services;
 using GitHub.VisualStudio;
-using GitHub.InlineReviews.Services;
 
 namespace GitHub.InlineReviews.Margins
 {
@@ -16,7 +15,9 @@ namespace GitHub.InlineReviews.Margins
     [Order(After = PredefinedMarginNames.Glyph)]
     [MarginContainer(PredefinedMarginNames.Left)]
     [ContentType("text")]
-    [TextViewRole(PredefinedTextViewRoles.Interactive)]
+    [TextViewRole("LEFTDIFF")]
+    [TextViewRole("RIGHTDIFF")]
+    [TextViewRole("INLINEDIFF")]    
     internal sealed class InlineCommentMarginProvider : IWpfTextViewMarginProvider
     {
         readonly Lazy<IEditorFormatMapService> editorFormatMapService;

src/GitHub.InlineReviews/Tags/InlineCommentTaggerProvider.cs

@@ -1,9 +1,9 @@
 using System;
 using System.ComponentModel.Composition;
 using GitHub.Extensions;
-using GitHub.InlineReviews.Services;
 using GitHub.Services;
 using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Differencing;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
 using Microsoft.VisualStudio.Utilities;
@@ -16,6 +16,9 @@ namespace GitHub.InlineReviews.Tags
     [Export(typeof(IViewTaggerProvider))]
     [ContentType("text")]
     [TagType(typeof(ShowInlineCommentTag))]
+    [TextViewRole("LEFTDIFF")]
+    [TextViewRole("RIGHTDIFF")]
+    [TextViewRole("INLINEDIFF")]
     class InlineCommentTaggerProvider : IViewTaggerProvider
     {
         readonly IPullRequestSessionManager sessionManager;
@@ -31,11 +34,22 @@ public InlineCommentTaggerProvider(
 
         public ITagger<T> CreateTagger<T>(ITextView view, ITextBuffer buffer) where T : ITag
         {
-            return buffer.Properties.GetOrCreateSingletonProperty(() =>
-                new InlineCommentTagger(
-                    view,
-                    buffer,
-                    sessionManager)) as ITagger<T>;
+            if (view.TextViewModel is IDifferenceTextViewModel model)
+            {
+                if (buffer == model.Viewer.DifferenceBuffer.BaseLeftBuffer)
+                {
+                    return view.Properties.GetOrCreateSingletonProperty("InlineTaggerForLeftBuffer",
+                        () => new InlineCommentTagger(view, buffer, sessionManager) as ITagger<T>);
+                }
+
+                if (buffer == model.Viewer.DifferenceBuffer.BaseRightBuffer)
+                {
+                    return view.Properties.GetOrCreateSingletonProperty("InlineTaggerForRightBuffer",
+                        () => new InlineCommentTagger(view, buffer, sessionManager) as ITagger<T>);
+                }
+            }
+
+            return null;
         }
     }
 }