This repository was archived by the owner on Jul 19, 2026. It is now read-only.

Output window for visualization of OpenCppCoverage results is significantly improved.#37

Open
viacheslav-lozinskyi wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Output window for visualization of OpenCppCoverage results is significantly improved. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand All@@ -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%";
}
}
}
12 changes: 6 additions & 6 deletions VSPackage/CoverageRunner.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
{
Expand All@@ -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;
}

Expand DownExpand Up@@ -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;
Expand Down
3 changes: 3 additions & 0 deletions VSPackage/CoverageTree/CoverageTreeController.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
}
}
Expand Down
8 changes: 4 additions & 4 deletions VSPackage/CoverageTree/CoverageTreeManager.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
}
}
}
13 changes: 7 additions & 6 deletions VSPackage/ErrorHandler.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
}
}

Expand Down
3 changes: 2 additions & 1 deletion VSPackage/OpenCppCoverageCmdLine.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
}
}
Expand Down
10 changes: 5 additions & 5 deletions VSPackage/OpenCppCoveragePackage.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down
7 changes: 3 additions & 4 deletions VSPackage/OpenCppCoverageRunner.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace OpenCppCoverage.VSPackage
Expand All@@ -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(() =>
Expand Down
8 changes: 4 additions & 4 deletions VSPackage/OutputWindowWriter.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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");
}
}
11 changes: 4 additions & 7 deletions VSPackage/ProjectBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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;
}
}

Expand Down
7 changes: 5 additions & 2 deletions VSPackage/Settings/SettingsStorage.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}

Expand All@@ -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);
}
}
Expand Down
3 changes: 2 additions & 1 deletion VSPackage/Settings/StartUpProjectSettingsBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
}
}

Expand Down
1 change: 1 addition & 0 deletions VSPackage/Settings/UI/MainSettingController.cs
View file
Open in desktop
Original file line numberDiff line numberDiff 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
3 changes: 2 additions & 1 deletion VSPackage/TemporaryFile.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,9 @@ public void Dispose()
{
File.Delete(this.Path);
}
catch (FileNotFoundException)
catch (FileNotFoundException e)
{
OutputWindowWriter.WriteLine("ERROR: " + e.Message);
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions VSPackage/VSPackage.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion VSPackage/source.extension.vsixmanifest
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Jul 19, 2026. It is now read-only.

Output window for visualization of OpenCppCoverage results is significantly improved.#37
 Open

viacheslav-lozinskyi
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Output window for visualization of OpenCppCoverage results is significantly improved.
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 19 additions & 0 deletions
VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand All@@ -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%";
 }
 }
}

12 changes: 6 additions & 6 deletions
VSPackage/CoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
 {
Expand All@@ -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;
 }

Expand DownExpand Up@@ -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;
Expand Down

3 changes: 3 additions & 0 deletions
VSPackage/CoverageTree/CoverageTreeController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/CoverageTree/CoverageTreeManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
 }
 }
}

13 changes: 7 additions & 6 deletions
VSPackage/ErrorHandler.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/OpenCppCoverageCmdLine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

10 changes: 5 additions & 5 deletions
VSPackage/OpenCppCoveragePackage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

7 changes: 3 additions & 4 deletions
VSPackage/OpenCppCoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace OpenCppCoverage.VSPackage
Expand All@@ -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(() =>
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/OutputWindowWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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");
 }
}

11 changes: 4 additions & 7 deletions
VSPackage/ProjectBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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;
 }
 }

Expand Down

7 changes: 5 additions & 2 deletions
VSPackage/Settings/SettingsStorage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
 }

Expand All@@ -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);
 }
 }
Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/Settings/StartUpProjectSettingsBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
VSPackage/Settings/UI/MainSettingController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff 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

3 changes: 2 additions & 1 deletion
VSPackage/TemporaryFile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,9 @@ public void Dispose()
 {
 File.Delete(this.Path);
 } 
 catch (FileNotFoundException)
 catch (FileNotFoundException e)
 {
 OutputWindowWriter.WriteLine("ERROR: " + e.Message);
 }
 }
 }
Expand Down

3 changes: 0 additions & 3 deletions
VSPackage/VSPackage.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
VSPackage/source.extension.vsixmanifest

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jul 19, 2026. It is now read-only.

Output window for visualization of OpenCppCoverage results is significantly improved.#37
 Open

viacheslav-lozinskyi
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Output window for visualization of OpenCppCoverage results is significantly improved.
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 19 additions & 0 deletions
VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand All@@ -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%";
 }
 }
}

12 changes: 6 additions & 6 deletions
VSPackage/CoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
 {
Expand All@@ -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;
 }

Expand DownExpand Up@@ -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;
Expand Down

3 changes: 3 additions & 0 deletions
VSPackage/CoverageTree/CoverageTreeController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/CoverageTree/CoverageTreeManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
 }
 }
}

13 changes: 7 additions & 6 deletions
VSPackage/ErrorHandler.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/OpenCppCoverageCmdLine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

10 changes: 5 additions & 5 deletions
VSPackage/OpenCppCoveragePackage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

7 changes: 3 additions & 4 deletions
VSPackage/OpenCppCoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace OpenCppCoverage.VSPackage
Expand All@@ -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(() =>
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/OutputWindowWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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");
 }
}

11 changes: 4 additions & 7 deletions
VSPackage/ProjectBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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;
 }
 }

Expand Down

7 changes: 5 additions & 2 deletions
VSPackage/Settings/SettingsStorage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
 }

Expand All@@ -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);
 }
 }
Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/Settings/StartUpProjectSettingsBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
VSPackage/Settings/UI/MainSettingController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff 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

3 changes: 2 additions & 1 deletion
VSPackage/TemporaryFile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,9 @@ public void Dispose()
 {
 File.Delete(this.Path);
 } 
 catch (FileNotFoundException)
 catch (FileNotFoundException e)
 {
 OutputWindowWriter.WriteLine("ERROR: " + e.Message);
 }
 }
 }
Expand Down

3 changes: 0 additions & 3 deletions
VSPackage/VSPackage.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
VSPackage/source.extension.vsixmanifest

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jul 19, 2026. It is now read-only.

Output window for visualization of OpenCppCoverage results is significantly improved.#37
 Open

viacheslav-lozinskyi
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Output window for visualization of OpenCppCoverage results is significantly improved.
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 19 additions & 0 deletions
VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand All@@ -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%";
 }
 }
}

12 changes: 6 additions & 6 deletions
VSPackage/CoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
 {
Expand All@@ -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;
 }

Expand DownExpand Up@@ -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;
Expand Down

3 changes: 3 additions & 0 deletions
VSPackage/CoverageTree/CoverageTreeController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/CoverageTree/CoverageTreeManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
 }
 }
}

13 changes: 7 additions & 6 deletions
VSPackage/ErrorHandler.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/OpenCppCoverageCmdLine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

10 changes: 5 additions & 5 deletions
VSPackage/OpenCppCoveragePackage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

7 changes: 3 additions & 4 deletions
VSPackage/OpenCppCoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace OpenCppCoverage.VSPackage
Expand All@@ -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(() =>
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/OutputWindowWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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");
 }
}

11 changes: 4 additions & 7 deletions
VSPackage/ProjectBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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;
 }
 }

Expand Down

7 changes: 5 additions & 2 deletions
VSPackage/Settings/SettingsStorage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
 }

Expand All@@ -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);
 }
 }
Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/Settings/StartUpProjectSettingsBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
VSPackage/Settings/UI/MainSettingController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff 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

3 changes: 2 additions & 1 deletion
VSPackage/TemporaryFile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,9 @@ public void Dispose()
 {
 File.Delete(this.Path);
 } 
 catch (FileNotFoundException)
 catch (FileNotFoundException e)
 {
 OutputWindowWriter.WriteLine("ERROR: " + e.Message);
 }
 }
 }
Expand Down

3 changes: 0 additions & 3 deletions
VSPackage/VSPackage.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
VSPackage/source.extension.vsixmanifest

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Jul 19, 2026. It is now read-only.

Output window for visualization of OpenCppCoverage results is significantly improved.#37
 Open

viacheslav-lozinskyi
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Output window for visualization of OpenCppCoverage results is significantly improved.
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 19 additions & 0 deletions
VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand All@@ -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%";
 }
 }
}

12 changes: 6 additions & 6 deletions
VSPackage/CoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
 {
Expand All@@ -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;
 }

Expand DownExpand Up@@ -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;
Expand Down

3 changes: 3 additions & 0 deletions
VSPackage/CoverageTree/CoverageTreeController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/CoverageTree/CoverageTreeManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
 }
 }
}

13 changes: 7 additions & 6 deletions
VSPackage/ErrorHandler.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/OpenCppCoverageCmdLine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

10 changes: 5 additions & 5 deletions
VSPackage/OpenCppCoveragePackage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

7 changes: 3 additions & 4 deletions
VSPackage/OpenCppCoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace OpenCppCoverage.VSPackage
Expand All@@ -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(() =>
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/OutputWindowWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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");
 }
}

11 changes: 4 additions & 7 deletions
VSPackage/ProjectBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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;
 }
 }

Expand Down

7 changes: 5 additions & 2 deletions
VSPackage/Settings/SettingsStorage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
 }

Expand All@@ -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);
 }
 }
Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/Settings/StartUpProjectSettingsBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
VSPackage/Settings/UI/MainSettingController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff 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

3 changes: 2 additions & 1 deletion
VSPackage/TemporaryFile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,9 @@ public void Dispose()
 {
 File.Delete(this.Path);
 } 
 catch (FileNotFoundException)
 catch (FileNotFoundException e)
 {
 OutputWindowWriter.WriteLine("ERROR: " + e.Message);
 }
 }
 }
Expand Down

3 changes: 0 additions & 3 deletions
VSPackage/VSPackage.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
VSPackage/source.extension.vsixmanifest

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jul 19, 2026. It is now read-only.

Output window for visualization of OpenCppCoverage results is significantly improved.#37
 Open

viacheslav-lozinskyi
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Output window for visualization of OpenCppCoverage results is significantly improved.
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 19 additions & 0 deletions
VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand All@@ -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%";
 }
 }
}

12 changes: 6 additions & 6 deletions
VSPackage/CoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
 {
Expand All@@ -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;
 }

Expand DownExpand Up@@ -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;
Expand Down

3 changes: 3 additions & 0 deletions
VSPackage/CoverageTree/CoverageTreeController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/CoverageTree/CoverageTreeManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
 }
 }
}

13 changes: 7 additions & 6 deletions
VSPackage/ErrorHandler.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/OpenCppCoverageCmdLine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

10 changes: 5 additions & 5 deletions
VSPackage/OpenCppCoveragePackage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

7 changes: 3 additions & 4 deletions
VSPackage/OpenCppCoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace OpenCppCoverage.VSPackage
Expand All@@ -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(() =>
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/OutputWindowWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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");
 }
}

11 changes: 4 additions & 7 deletions
VSPackage/ProjectBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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;
 }
 }

Expand Down

7 changes: 5 additions & 2 deletions
VSPackage/Settings/SettingsStorage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
 }

Expand All@@ -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);
 }
 }
Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/Settings/StartUpProjectSettingsBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
VSPackage/Settings/UI/MainSettingController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff 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

3 changes: 2 additions & 1 deletion
VSPackage/TemporaryFile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,9 @@ public void Dispose()
 {
 File.Delete(this.Path);
 } 
 catch (FileNotFoundException)
 catch (FileNotFoundException e)
 {
 OutputWindowWriter.WriteLine("ERROR: " + e.Message);
 }
 }
 }
Expand Down

3 changes: 0 additions & 3 deletions
VSPackage/VSPackage.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
VSPackage/source.extension.vsixmanifest

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jul 19, 2026. It is now read-only.

Output window for visualization of OpenCppCoverage results is significantly improved.#37
 Open

viacheslav-lozinskyi
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Output window for visualization of OpenCppCoverage results is significantly improved.
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 19 additions & 0 deletions
VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand All@@ -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%";
 }
 }
}

12 changes: 6 additions & 6 deletions
VSPackage/CoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
 {
Expand All@@ -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;
 }

Expand DownExpand Up@@ -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;
Expand Down

3 changes: 3 additions & 0 deletions
VSPackage/CoverageTree/CoverageTreeController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/CoverageTree/CoverageTreeManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
 }
 }
}

13 changes: 7 additions & 6 deletions
VSPackage/ErrorHandler.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/OpenCppCoverageCmdLine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

10 changes: 5 additions & 5 deletions
VSPackage/OpenCppCoveragePackage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

7 changes: 3 additions & 4 deletions
VSPackage/OpenCppCoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace OpenCppCoverage.VSPackage
Expand All@@ -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(() =>
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/OutputWindowWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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");
 }
}

11 changes: 4 additions & 7 deletions
VSPackage/ProjectBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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;
 }
 }

Expand Down

7 changes: 5 additions & 2 deletions
VSPackage/Settings/SettingsStorage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
 }

Expand All@@ -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);
 }
 }
Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/Settings/StartUpProjectSettingsBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
VSPackage/Settings/UI/MainSettingController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff 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

3 changes: 2 additions & 1 deletion
VSPackage/TemporaryFile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,9 @@ public void Dispose()
 {
 File.Delete(this.Path);
 } 
 catch (FileNotFoundException)
 catch (FileNotFoundException e)
 {
 OutputWindowWriter.WriteLine("ERROR: " + e.Message);
 }
 }
 }
Expand Down

3 changes: 0 additions & 3 deletions
VSPackage/VSPackage.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
VSPackage/source.extension.vsixmanifest

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Jul 19, 2026. It is now read-only.

Output window for visualization of OpenCppCoverage results is significantly improved.#37
 Open

viacheslav-lozinskyi
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Output window for visualization of OpenCppCoverage results is significantly improved.
#37
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 19 additions & 0 deletions
VSPackage/CoverageRateBuilder/CoverageRateBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand All@@ -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%";
 }
 }
}

12 changes: 6 additions & 6 deletions
VSPackage/CoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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))
 {
Expand All@@ -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;
 }

Expand DownExpand Up@@ -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;
Expand Down

3 changes: 3 additions & 0 deletions
VSPackage/CoverageTree/CoverageTreeController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/CoverageTree/CoverageTreeManager.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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());
 }
 }
}

13 changes: 7 additions & 6 deletions
VSPackage/ErrorHandler.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/OpenCppCoverageCmdLine.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }
Expand Down

10 changes: 5 additions & 5 deletions
VSPackage/OpenCppCoveragePackage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand Down

7 changes: 3 additions & 4 deletions
VSPackage/OpenCppCoverageRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;

namespace OpenCppCoverage.VSPackage
Expand All@@ -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(() =>
Expand Down

8 changes: 4 additions & 4 deletions
VSPackage/OutputWindowWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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");
 }
}

11 changes: 4 additions & 7 deletions
VSPackage/ProjectBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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;
 }
 }

Expand Down

7 changes: 5 additions & 2 deletions
VSPackage/Settings/SettingsStorage.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
 }

Expand All@@ -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);
 }
 }
Expand Down

3 changes: 2 additions & 1 deletion
VSPackage/Settings/StartUpProjectSettingsBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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);
 }
 }

Expand Down

1 change: 1 addition & 0 deletions
VSPackage/Settings/UI/MainSettingController.cs

View file


Open in desktop

Original file line numberDiff line numberDiff 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

3 changes: 2 additions & 1 deletion
VSPackage/TemporaryFile.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,9 @@ public void Dispose()
 {
 File.Delete(this.Path);
 } 
 catch (FileNotFoundException)
 catch (FileNotFoundException e)
 {
 OutputWindowWriter.WriteLine("ERROR: " + e.Message);
 }
 }
 }
Expand Down

3 changes: 0 additions & 3 deletions
VSPackage/VSPackage.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down

2 changes: 1 addition & 1 deletion
VSPackage/source.extension.vsixmanifest

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down