CoverageLineGlyphTaggerProvider to prepare coverage colours

Author: tonyhallett

SharedProject/Impl/CoverageLineGlyphTagger.cs

@@ -5,38 +5,28 @@
 using Microsoft.VisualStudio.Text.Tagging;
 using FineCodeCoverage.Engine.Model;
 using System.Linq;
-using Microsoft.VisualStudio.Shell;
 
 namespace FineCodeCoverage.Impl
 {
 	internal class CoverageLineGlyphTagger : ITagger<CoverageLineGlyphTag>
 	{
 		private readonly ITextBuffer _textBuffer;
         private readonly IFCCEngine fccEngine;
-		private readonly ICoverageColoursProvider coverageColoursProvider;
 
 		public event EventHandler<SnapshotSpanEventArgs> TagsChanged;
 
-		public CoverageLineGlyphTagger(ITextBuffer textBuffer, IFCCEngine fccEngine, ICoverageColoursProvider coverageColoursProvider)
+		public CoverageLineGlyphTagger(ITextBuffer textBuffer, IFCCEngine fccEngine)
 		{
 			_textBuffer = textBuffer;
             this.fccEngine = fccEngine;
-            this.coverageColoursProvider = coverageColoursProvider;
             fccEngine.UpdateMarginTags += FCCEngine_UpdateMarginTags;
 		}
 
 		private void FCCEngine_UpdateMarginTags(UpdateMarginTagsEventArgs e)
 		{
-#pragma warning disable VSTHRD102 // Implement internal logic asynchronously
-			ThreadHelper.JoinableTaskFactory.Run(async () =>
-#pragma warning restore VSTHRD102 // Implement internal logic asynchronously
-			{
-				await coverageColoursProvider.PrepareAsync();
-				var span = new SnapshotSpan(_textBuffer.CurrentSnapshot, 0, _textBuffer.CurrentSnapshot.Length);
-				var spanEventArgs = new SnapshotSpanEventArgs(span);
-				TagsChanged?.Invoke(this, spanEventArgs);
-			});
-			
+			var span = new SnapshotSpan(_textBuffer.CurrentSnapshot, 0, _textBuffer.CurrentSnapshot.Length);
+			var spanEventArgs = new SnapshotSpanEventArgs(span);
+			TagsChanged?.Invoke(this, spanEventArgs);
 		}
 
 		IEnumerable<ITagSpan<CoverageLineGlyphTag>> ITagger<CoverageLineGlyphTag>.GetTags(NormalizedSnapshotSpanCollection spans)

SharedProject/Impl/CoverageLineGlyphTaggerProvider.cs

@@ -3,6 +3,7 @@
 using System.ComponentModel.Composition;
 using Microsoft.VisualStudio.Text.Tagging;
 using FineCodeCoverage.Engine;
+using Microsoft.VisualStudio.Shell;
 
 namespace FineCodeCoverage.Impl
 {
@@ -16,14 +17,29 @@ internal class CoverageLineGlyphTaggerProvider : ITaggerProvider
         private readonly ICoverageColoursProvider coverageColoursProvider;
 
         [ImportingConstructor]
-		public CoverageLineGlyphTaggerProvider(IFCCEngine fccEngine, ICoverageColoursProvider coverageColoursProvider)
+		public CoverageLineGlyphTaggerProvider(
+            IFCCEngine fccEngine, 
+            ICoverageColoursProvider coverageColoursProvider)
         {
             this.fccEngine = fccEngine;
+            fccEngine.UpdateMarginTags += FccEngine_UpdateMarginTags;
             this.coverageColoursProvider = coverageColoursProvider;
         }
-		public ITagger<T> CreateTagger<T>(ITextBuffer textBuffer) where T : ITag
+
+        private void FccEngine_UpdateMarginTags(UpdateMarginTagsEventArgs e)
+        {
+#pragma warning disable VSTHRD102 // Implement internal logic asynchronously
+			ThreadHelper.JoinableTaskFactory.Run(async () =>
+#pragma warning restore VSTHRD102 // Implement internal logic asynchronously
+			{
+				await coverageColoursProvider.PrepareAsync();
+			});
+			
+        }
+
+        public ITagger<T> CreateTagger<T>(ITextBuffer textBuffer) where T : ITag
 		{
-			return new CoverageLineGlyphTagger(textBuffer, fccEngine, coverageColoursProvider) as ITagger<T>;
+			return new CoverageLineGlyphTagger(textBuffer, fccEngine) as ITagger<T>;
 		}
 	}
 }