OpenCppCoverage · viacheslav-lozinskyi · Mar 23, 2020
diff --git a/VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs b/VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs
@@ -37,6 +37,7 @@ public CoverageRate Build(CoverageResult result)
                 foreach (var protoFile in protoModule.FilesList)
                     module.AddChild(BuildFileCoverage(protoFile));
                 coverageRate.AddChild(module);
+                Update(module);
             }
 
             return coverageRate;
@@ -52,5 +53,23 @@ FileCoverage BuildFileCoverage(ProtoBuff.FileCoverage protoFile)
                 lines.Select(l => new LineCoverage(
                     (int)l.LineNumber, l.HasBeenExecuted)).ToList());
         }
+
+        private static void Update(ModuleCoverage module)
+        {
+            OutputWindowWriter.WriteLine("PROJECT: \"" + module.Name + "\"\u0004 // <Lines: " + module.CoverLineCount.ToString() + " / " + module.TotalLineCount.ToString() + "> " + GetProgress(module.CoverLineCount, module.TotalLineCount));
+            foreach (FileCoverage current in module.Children)
+            {
+                OutputWindowWriter.WriteLine(" FILE: \"" + current.Path + "\" // <Lines: " + current.CoverLineCount.ToString() + " / " + current.TotalLineCount.ToString() + "> " + GetProgress(current.CoverLineCount, current.TotalLineCount));
+            }
+        }
+
+        private static string GetProgress(int current, int total)
+        {
+            if (total > 0)
+            {
+                return ((current * 100) / total).ToString() + "%";
+            }
+            return "100%";
+        }
     }
 }
diff --git a/VSPackage/CoverageRunner.cs b/VSPackage/CoverageRunner.cs
@@ -94,7 +94,6 @@ public void RunCoverageOnStartupProject(MainSettings settings)
         void RunCoverage(MainSettings settings)
         {
             outputWindowWriter.ActivatePane();
-            outputWindowWriter.WriteLine("Start computing code coverage...");
 
             if (!File.Exists(settings.BasicSettings.ProgramToRun))
             {
@@ -109,9 +108,10 @@ void RunCoverage(MainSettings settings)
                 AddBinaryOutput(settings.ImportExportSettings, coveragePath);
                 onCoverageFinished = openCppCoverageRunner.RunCodeCoverageAsync(settings);
             }
-            catch (Exception)
+            catch (Exception e)
             {
                 coveragePath.Dispose();
+                OutputWindowWriter.WriteLine("ERROR: " + e.Message);
                 throw;
             }
 
@@ -148,12 +148,12 @@ void OnCoverageRateBuilt(CoverageRate coverageRate, string coveragePath)
         {
             if (coverageRate == null)
             {
-                outputWindowWriter.WriteLine("The execution of the previous line failed." +
-                    " Please execute the previous line in a promt" + 
-                    " command to have more information about the issue.");
+                OutputWindowWriter.WriteLine("ERROR: The execution of the previous line failed.");
+                OutputWindowWriter.WriteLine(" Please execute the previous line in a promt command to have more information about the issue.");
                 throw new VSPackageException("Cannot generate coverage. See output pane for more information");                
             }
-            outputWindowWriter.WriteLine("Coverage written in " + coveragePath);
+            OutputWindowWriter.WriteLine("COVERAGE: Computing finished\u0006");
+            OutputWindowWriter.WriteLine(" Result written in \"" + coveragePath + "\"");
 
             coverageTreeManager.ShowTreeCoverage(this.dte, this.coverageViewManager, coverageRate);
             this.coverageViewManager.CoverageRate = coverageRate;

diff --git a/VSPackage/CoverageTree/CoverageTreeController.cs b/VSPackage/CoverageTree/CoverageTreeController.cs
@@ -74,7 +74,10 @@ public SharpTreeNode Current
                 if (fileCoverage != null)
                 {
                     if (this.dte == null)
+                    {
+                        //outputWindowWriter.WriteLine("ERROR: UpdateCoverageRate should be call first.");
                         throw new InvalidOperationException("UpdateCoverageRate should be call first.");
+                    }
                     this.dte.ItemOperations.OpenFile(fileCoverage.Path, Constants.vsViewKindCode);
                 }
             }

diff --git a/VSPackage/CoverageTree/CoverageTreeManager.cs b/VSPackage/CoverageTree/CoverageTreeManager.cs
@@ -50,11 +50,11 @@ public void ShowTreeCoverage()
         //---------------------------------------------------------------------        
         void ShowTreeCoverage(Action<CoverageTreeToolWindow> action)
         {
-            var window = this.windowFinder.FindToolWindow<CoverageTreeToolWindow>();
+            //var window = this.windowFinder.FindToolWindow<CoverageTreeToolWindow>();
 
-            action(window);
-            var frame = (IVsWindowFrame)window.Frame;
-            Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(frame.Show());
+            //action(window);
+            //var frame = (IVsWindowFrame)window.Frame;
+            //Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(frame.Show());
         }
     }
 }
diff --git a/VSPackage/ErrorHandler.cs b/VSPackage/ErrorHandler.cs
@@ -38,18 +38,19 @@ public async Task ExecuteAsync(Func<Task> action)
             {
                 await action();
             }
-            catch (VSPackageException exception)
+            catch (VSPackageException e)
             {
                 if (OutputWriter != null)
-                    OutputWriter.WriteLine(exception.Message);
-                ShowMessage(exception.Message);
+                    OutputWindowWriter.WriteLine("ERROR: " + e.Message);
+                ShowMessage(e.Message);
             }
-            catch (Exception exception)
+            catch (Exception e)
             {
-                if (OutputWriter != null && OutputWriter.WriteLine(exception.ToString()))             
+                if (OutputWriter != null && OutputWindowWriter.WriteLine("ERROR: " + e.ToString()))             
                     ShowMessage("Unknow error. Please see the output console for more information.");
                 else
-                    ShowMessage(exception.ToString());
+                    ShowMessage(e.ToString());
+                OutputWindowWriter.WriteLine("ERROR: " + e.Message);
             }
         }
 

diff --git a/VSPackage/OpenCppCoverageCmdLine.cs b/VSPackage/OpenCppCoverageCmdLine.cs
@@ -155,9 +155,10 @@ void AppendMiscellaneousSettings(
                     foreach (var line in lines)
                         writer.WriteLine(line);
                 } 
-                catch (FileNotFoundException)
+                catch (FileNotFoundException e)
                 {
                     string message = $"Cannot find the config file defined in Miscellanous tab: {settings.OptionalConfigFile}";
+                    OutputWindowWriter.WriteLine("ERROR: " + e.Message);
                     throw new VSPackageException(message);
                 }
             }

diff --git a/VSPackage/OpenCppCoveragePackage.cs b/VSPackage/OpenCppCoveragePackage.cs
@@ -44,11 +44,11 @@ namespace OpenCppCoverage.VSPackage
     [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
     // This attribute is needed to let the shell know that this package exposes some menus.
     [ProvideMenuResource("Menus.ctmenu", 1)]
-    [ProvideToolWindow(typeof(CoverageTreeToolWindow),
-        Style = Microsoft.VisualStudio.Shell.VsDockStyle.Tabbed,
-        MultiInstances = false,
-        Transient = true,
-        Window = Microsoft.VisualStudio.Shell.Interop.ToolWindowGuids.Outputwindow)]
+    //[ProvideToolWindow(typeof(CoverageTreeToolWindow),
+    //    Style = Microsoft.VisualStudio.Shell.VsDockStyle.Tabbed,
+    //    MultiInstances = false,
+    //    Transient = true,
+    //    Window = Microsoft.VisualStudio.Shell.Interop.ToolWindowGuids.Outputwindow)]
     [ProvideToolWindow(typeof(SettingToolWindow),
         Style = Microsoft.VisualStudio.Shell.VsDockStyle.Float,
         MultiInstances = false,

diff --git a/VSPackage/OpenCppCoverageRunner.cs b/VSPackage/OpenCppCoverageRunner.cs
@@ -18,7 +18,6 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
 namespace OpenCppCoverage.VSPackage
@@ -44,9 +43,9 @@ public Task RunCodeCoverageAsync(MainSettings settings)
             var fileName = GetOpenCppCoveragePath(basicSettings.ProgramToRun);
             var arguments = this.openCppCoverageCmdLine.Build(settings);
 
-            this.outputWindowWriter.WriteLine("Run:");
-            this.outputWindowWriter.WriteLine(string.Format(@"""{0}"" {1}",
-                fileName, arguments));
+            OutputWindowWriter.WriteLine("COVERAGE: Computing started\u0006");
+            OutputWindowWriter.WriteLine(" File name = " + fileName);
+            OutputWindowWriter.WriteLine(" Arguments = " + arguments);
 
             // Run in a new thread to not block UI thread.
             return Task.Run(() =>

diff --git a/VSPackage/OutputWindowWriter.cs b/VSPackage/OutputWindowWriter.cs
@@ -46,16 +46,16 @@ public OutputWindowWriter(DTE2 dte, IVsOutputWindow outputWindow)
         //---------------------------------------------------------------------
         public void ActivatePane()
         {
-            outputWindowPane_.Activate();
+            //outputWindowPane_.Activate();
         }
 
         //---------------------------------------------------------------------
-        public bool WriteLine(string message)
+        public static bool WriteLine(string message)
         {
             return Microsoft.VisualStudio.ErrorHandler.Succeeded(outputWindowPane_.OutputString(message + "\n"));
         }
-        
-        readonly IVsOutputWindowPane outputWindowPane_;
+
+        private static IVsOutputWindowPane outputWindowPane_ = null;
         public readonly static Guid OpenCppCoverageOutputPaneGuid = new Guid("CB47C727-5E45-467B-A4CD-4A025986A8A0");
     }
 }
diff --git a/VSPackage/ProjectBuilder.cs b/VSPackage/ProjectBuilder.cs
@@ -50,10 +50,6 @@ public void Build(
 
             // buildEvents need to be a member to avoid a garbage collector issue.
             this.buildEvents.OnBuildProjConfigDone += buildHandler;
-
-            this.outputWindowWriter.WriteLine(
-                "Start building " + projectName 
-                + " " + solutionConfigurationName);
 
             var output = dte.Windows.Item(EnvDTE.Constants.vsWindowKindOutput);
             if (output != null)
@@ -67,9 +63,10 @@ public void Build(
             }
             catch (COMException e)
             {
-                throw new VSPackageException(
-                    string.Format("Error when building {0} with configuration {1}: {2}",
-                        projectName, solutionConfigurationName, e.Message));
+                OutputWindowWriter.WriteLine("ERROR: " + e.Message);
+                OutputWindowWriter.WriteLine("  Project = " + projectName);
+                OutputWindowWriter.WriteLine("  Configuration = " + solutionConfigurationName);
+                throw;
             }
         }
 

diff --git a/VSPackage/Settings/SettingsStorage.cs b/VSPackage/Settings/SettingsStorage.cs
@@ -53,12 +53,14 @@ public UserInterfaceSettings TryLoad(string optionalProjectPath, string optional
             {
                 json = File.ReadAllText(configPath);
             }
-            catch (FileNotFoundException)
+            catch (FileNotFoundException e)
             {
+                OutputWindowWriter.WriteLine("ERROR: " + e.Message);
                 return null;
             }
-            catch (DirectoryNotFoundException)
+            catch (DirectoryNotFoundException e)
             {
+                OutputWindowWriter.WriteLine("ERROR: " + e.Message);
                 return null;
             }
 
@@ -70,6 +72,7 @@ public UserInterfaceSettings TryLoad(string optionalProjectPath, string optional
             {
                 var error = string.Format(
                     $"Error when deserializing {configPath} : {e.Message}\nRemoving {configPath} should fix this issue.");
+                OutputWindowWriter.WriteLine("ERROR: " + e.Message);
                 throw new VSPackageException(error);
             }
         }

diff --git a/VSPackage/Settings/StartUpProjectSettingsBuilder.cs b/VSPackage/Settings/StartUpProjectSettingsBuilder.cs
@@ -166,9 +166,10 @@ List<ExtendedProject> CreateExtendedProjectsFor(Project project)
                     if (projectObject != null && projectObject.Kind == "VCProject")
                         projects.Add(new ExtendedProject(project, new DynamicVCProject(projectObject)));
                 }
-                catch (RuntimeBinderException)
+                catch (RuntimeBinderException e)
                 {
                     // Nothing because not a VCProject
+                    OutputWindowWriter.WriteLine("ERROR: " + e.Message);
                 }
             }
 

diff --git a/VSPackage/Settings/UI/MainSettingController.cs b/VSPackage/Settings/UI/MainSettingController.cs
@@ -152,6 +152,7 @@ public TabItem SelectedTab
                     catch (Exception e)
                     {
                         this.CommandLineText = e.Message;
+                        OutputWindowWriter.WriteLine("ERROR: " + e.Message);
                     }
                 }
             }

diff --git a/VSPackage/TemporaryFile.cs b/VSPackage/TemporaryFile.cs
@@ -39,8 +39,9 @@ public void Dispose()
             {
                 File.Delete(this.Path);
             } 
-            catch (FileNotFoundException)
+            catch (FileNotFoundException e)
             {
+                OutputWindowWriter.WriteLine("ERROR: " + e.Message);
             }
         }
     }

diff --git a/VSPackage/VSPackage.csproj b/VSPackage/VSPackage.csproj
@@ -277,9 +277,6 @@
       <IncludeInVSIX>true</IncludeInVSIX>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Newtonsoft.Json.dll">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
     <Content Include="OpenCppCoverage-x64\boost_date_time-vc141-mt-x64-1_69.dll">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>

diff --git a/VSPackage/source.extension.vsixmanifest b/VSPackage/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="c6a77aca-f53c-4cd1-97d7-0ed595751347" Version="0.9.7.1" Language="en-US" Publisher="OpenCppCoverage" />
+        <Identity Id="c6a77aca-f53c-4cd1-97d7-0ed595751347" Version="0.9.7.2" Language="en-US" Publisher="OpenCppCoverage" />
         <DisplayName>OpenCppCoverage Plugin</DisplayName>
         <Description xml:space="preserve">Visual Studio plugin for OpenCppCoverage to compute code coverage for C++ application.</Description>
         <MoreInfo>https://github.com/OpenCppCoverage/OpenCppCoveragePlugin</MoreInfo>
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,6 +152,7 @@ public TabItem SelectedTab @@
                         catch (Exception e)
                         {
                             this.CommandLineText = e.Message;
+                            OutputWindowWriter.WriteLine("ERROR: " + e.Message);
                         }
                     }
                 }
@@ Expand Down @@