Merge pull request #32384 from dotnet/merges/dev16.0-preview2-to-feat…

…ures/enhanced-using Merge dev16.0-preview2 to features/enhanced-using
dotnet · Jan 11, 2019 · 7ddf68e · 7ddf68e
2 parents f3420ba + 7c7c6f2
commit 7ddf68e
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs
@@ -212,6 +212,12 @@ private void OnDisconnect()
             }
 
             this.ContainedDocument.Dispose();
+
+            if (_bufferTagAggregator != null)
+            {
+                _bufferTagAggregator.Dispose();
+                _bufferTagAggregator = null;
+            }
         }
 
         private void OnDataBufferChanged(object sender, TextContentChangedEventArgs e)
@@ -220,14 +226,5 @@ private void OnDataBufferChanged(object sender, TextContentChangedEventArgs e)
             // when primary buffer has changed to update diagnostic positions.
             _diagnosticAnalyzerService.Reanalyze(this.Workspace, documentIds: SpecializedCollections.SingletonEnumerable(this.ContainedDocument.Id));
         }
-
-        public void Dispose()
-        {
-            if (_bufferTagAggregator != null)
-            {
-                _bufferTagAggregator.Dispose();
-                _bufferTagAggregator = null;
-            }
-        }
     }
 }