tidy

Author: tonyhallett

FineCodeCoverageTests/FCCEngine_Tests.cs

@@ -21,7 +21,6 @@ public class FCCEngine_Tests
     {
         private AutoMoqer mocker;
         private FCCEngine fccEngine;
-        private string htmlContent;
         private bool updatedMarginTags;
 
         [SetUp]
@@ -70,13 +69,6 @@ public void Should_Set_AppDataFolderPath_From_Initialized_AppDataFolder_Director
             Assert.AreEqual("some path", fccEngine.AppDataFolderPath);
         }
 
-        [Test]
-        public void Should_Update_The_Output_Window_With_Null_HtmlContent_When_ClearUI()
-        {
-            fccEngine.ClearUI();
-            Assert.Null(htmlContent);
-        }
-
         [Test]
         public void Should_UpdateMarginTags_And_Set_Null_CoverageLines_When_ClearUI()
         {
@@ -452,7 +444,6 @@ private async Task ThrowReadingReportHtml()
                     }
                 );
 
-            var badPath = "^&$!";
 
             List<CoverageLine> coverageLines = new List<CoverageLine>() { new CoverageLine() };
             mocker.GetMock<ICoberturaUtil>().Setup(coberturaUtil => coberturaUtil.CoverageLines).Returns(coverageLines);

SharedProject/Core/FCCEngine.cs

@@ -39,7 +39,7 @@ internal class FCCEngine : IFCCEngine
         private IInitializeStatusProvider initializeStatusProvider;
         private readonly ICoverageToolOutputManager coverageOutputManager;
         internal System.Threading.Tasks.Task reloadCoverageTask;
-        private ISolutionEvents solutionEvents; // keep alive
+        private readonly ISolutionEvents solutionEvents; // keep alive
         private readonly IEventAggregator eventAggregator;
 
         [ImportingConstructor]

SharedProject/Core/ReportGenerator/ReportGeneratorUtil.cs

@@ -84,7 +84,7 @@ private IReportColours ReportColours
             }
         }
 		private readonly bool showBranchCoverage = true;
-		private List<string> logs = new List<string>();
+		private readonly List<string> logs = new List<string>();
 
 		public string ReportGeneratorExePath { get; private set; }
 

SharedProject/Core/SourceFileOpener.cs

@@ -15,7 +15,6 @@ internal class SourceFileOpener : ISourceFileOpener
         private readonly ICoberturaUtil coberturaUtil;
         private readonly IMessageBox messageBox;
         private readonly ILogger logger;
-        private readonly IServiceProvider serviceProvider;
         private readonly DTE2 dte;
 
         [ImportingConstructor]
@@ -28,7 +27,6 @@ public SourceFileOpener(
             this.coberturaUtil = coberturaUtil;
             this.messageBox = messageBox;
             this.logger = logger;
-            this.serviceProvider = serviceProvider;
             ThreadHelper.ThrowIfNotOnUIThread();
             dte = (DTE2)serviceProvider.GetService(typeof(DTE));
             Assumes.Present(dte);

SharedProject/Impl/CoverageColorProvider.cs

@@ -14,7 +14,7 @@ internal class CoverageColorProvider : ICoverageColoursProvider, ICoverageColour
     {
         private readonly IVsFontAndColorStorage fontAndColorStorage;
         private Guid categoryWithCoverage = Guid.Parse("ff349800-ea43-46c1-8c98-878e78f46501");
-        private uint storeFlags = (uint)(__FCSTORAGEFLAGS.FCSF_READONLY | __FCSTORAGEFLAGS.FCSF_LOADDEFAULTS | __FCSTORAGEFLAGS.FCSF_NOAUTOCOLORS | __FCSTORAGEFLAGS.FCSF_PROPAGATECHANGES);
+        private readonly uint storeFlags = (uint)(__FCSTORAGEFLAGS.FCSF_READONLY | __FCSTORAGEFLAGS.FCSF_LOADDEFAULTS | __FCSTORAGEFLAGS.FCSF_NOAUTOCOLORS | __FCSTORAGEFLAGS.FCSF_PROPAGATECHANGES);
         private System.Windows.Media.Color defaultCoverageTouchedArea = System.Windows.Media.Colors.Green;
         private System.Windows.Media.Color defaultCoverageNotTouchedArea = System.Windows.Media.Colors.Red;
         private System.Windows.Media.Color defaultCoveragePartiallyTouchedArea = System.Windows.Media.Color.FromRgb(255, 165, 0);

SharedProject/Impl/CoverageLineGlyphFactory.cs

@@ -9,7 +9,7 @@ namespace FineCodeCoverage.Impl
 	internal class CoverageLineGlyphFactory : IGlyphFactory
 	{
 		private enum CoverageType { Covered, Partial, NotCovered}
-        private ICoverageColours coverageColours;
+        private readonly ICoverageColours coverageColours;
 
         public CoverageLineGlyphFactory(ICoverageColours coverageColours)
         {

SharedProject/Impl/Logger.cs

@@ -35,27 +35,24 @@ IServiceProvider serviceProvider
         staticLogger = this;
     }
 
-    private void SetPane()
+    private async Task SetPaneAsync()
     {
-        ThreadHelper.JoinableTaskFactory.Run(async () =>
-        {
-            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
-            _outputWindow = (IVsOutputWindow)_serviceProvider.GetService(typeof(SVsOutputWindow));
-            Assumes.Present(_outputWindow);
-            dte = (DTE2)_serviceProvider.GetService(typeof(EnvDTE.DTE));
-            Assumes.Present(dte);
-
-            // Create a new pane.
-            _outputWindow.CreatePane(
-                ref fccPaneGuid,
-                "FCC",
-                Convert.ToInt32(true),
-                Convert.ToInt32(false)); // do not clear with solution otherwise will not get initialize methods
-
-            // Retrieve the new pane.
-            _outputWindow.GetPane(ref fccPaneGuid, out IVsOutputWindowPane pane);
-            _pane = pane;
-        });
+        await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+        _outputWindow = (IVsOutputWindow)_serviceProvider.GetService(typeof(SVsOutputWindow));
+        Assumes.Present(_outputWindow);
+        dte = (DTE2)_serviceProvider.GetService(typeof(EnvDTE.DTE));
+        Assumes.Present(dte);
+
+        // Create a new pane.
+        _outputWindow.CreatePane(
+            ref fccPaneGuid,
+            "FCC",
+            Convert.ToInt32(true),
+            Convert.ToInt32(false)); // do not clear with solution otherwise will not get initialize methods
+
+        // Retrieve the new pane.
+        _outputWindow.GetPane(ref fccPaneGuid, out IVsOutputWindowPane pane);
+        _pane = pane;
     }
 
     [SuppressMessage("Usage", "VSTHRD102:Implement internal logic asynchronously")]
@@ -76,7 +73,7 @@ private void LogImpl(object[] message, bool withTitle)
 
                 if(_pane == null)
                 {
-                    SetPane();
+                    await SetPaneAsync();
                 }
 
                 if(_pane == null)
@@ -154,7 +151,7 @@ public async Task ShowAsync()
 
         if (_pane == null)
         {
-            SetPane();
+            await SetPaneAsync();
         }
 
         if (_pane != null)

SharedProject/Impl/TestContainerDiscovery/PackageInitializer.cs

@@ -32,7 +32,7 @@ public async Task InitializeAsync()
             if (serviceProvider.GetService(typeof(SVsShell)) is IVsShell shell)
             {
                 var packageToBeLoadedGuid = new Guid(OutputToolWindowPackage.PackageGuidString);
-                shell.LoadPackage(ref packageToBeLoadedGuid, out var package);
+                shell.LoadPackage(ref packageToBeLoadedGuid, out var _);
 
                 var outputWindowInitializedFile = Path.Combine(fccEngine.AppDataFolderPath, "outputWindowInitialized");