Skip to content

GH45: Fix missing exception handling in GeneratorScriptHost #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devlead merged 1 commit into from
Dec 5, 2025
Merged

GH45: Fix missing exception handling in GeneratorScriptHost #46

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
34 changes: 30 additions & 4 deletions ...e.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators#CakeScriptHost.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,44 @@ private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExe
public override async Task<CakeReport> RunTargetAsync(string target)
{
Settings.SetTarget(target);
var report = await Engine.RunTargetAsync(Context, strategy, Settings);
reporter.Write(report);
var report = await internalRunTargetAsync();
return report;
}

public override async Task<CakeReport> RunTargetsAsync(IEnumerable<string> targets)
{
Settings.SetTargets(targets);
var report = await Engine.RunTargetAsync(Context, strategy, Settings);
reporter.Write(report);
var report = await internalRunTargetAsync();
return report;
}

private async Task<CakeReport> internalRunTargetAsync()
{
try
{
var report = await Engine
.RunTargetAsync(Context, strategy, Settings)
.ConfigureAwait(false);

if (report != null && !report.IsEmpty)
{
reporter.Write(report);
}

ArgumentNullException.ThrowIfNull(report);

return report;
}
catch (CakeReportException cre)
{
if (cre.Report != null && !cre.Report.IsEmpty)
{
reporter.Write(cre.Report);
}

throw;
}
}
}

/// <member name="M:Cake.Core.Scripting.IScriptHost.Task(System.String)">
Expand Down
34 changes: 30 additions & 4 deletions ...Tests.RunGenerators_WithMainMethods_GeneratesMainMethodCalls#CakeScriptHost.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,44 @@ private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExe
public override async Task<CakeReport> RunTargetAsync(string target)
{
Settings.SetTarget(target);
var report = await Engine.RunTargetAsync(Context, strategy, Settings);
reporter.Write(report);
var report = await internalRunTargetAsync();
return report;
}

public override async Task<CakeReport> RunTargetsAsync(IEnumerable<string> targets)
{
Settings.SetTargets(targets);
var report = await Engine.RunTargetAsync(Context, strategy, Settings);
reporter.Write(report);
var report = await internalRunTargetAsync();
return report;
}

private async Task<CakeReport> internalRunTargetAsync()
{
try
{
var report = await Engine
.RunTargetAsync(Context, strategy, Settings)
.ConfigureAwait(false);

if (report != null && !report.IsEmpty)
{
reporter.Write(report);
}

ArgumentNullException.ThrowIfNull(report);

return report;
}
catch (CakeReportException cre)
{
if (cre.Report != null && !cre.Report.IsEmpty)
{
reporter.Write(cre.Report);
}

throw;
}
}
}

/// <member name="M:Cake.Core.Scripting.IScriptHost.Task(System.String)">
Expand Down
34 changes: 30 additions & 4 deletions ...Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakeScriptHost.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,44 @@ private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExe
public override async Task<CakeReport> RunTargetAsync(string target)
{
Settings.SetTarget(target);
var report = await Engine.RunTargetAsync(Context, strategy, Settings);
reporter.Write(report);
var report = await internalRunTargetAsync();
return report;
}

public override async Task<CakeReport> RunTargetsAsync(IEnumerable<string> targets)
{
Settings.SetTargets(targets);
var report = await Engine.RunTargetAsync(Context, strategy, Settings);
reporter.Write(report);
var report = await internalRunTargetAsync();
return report;
}

private async Task<CakeReport> internalRunTargetAsync()
{
try
{
var report = await Engine
.RunTargetAsync(Context, strategy, Settings)
.ConfigureAwait(false);

if (report != null && !report.IsEmpty)
{
reporter.Write(report);
}

ArgumentNullException.ThrowIfNull(report);

return report;
}
catch (CakeReportException cre)
{
if (cre.Report != null && !cre.Report.IsEmpty)
{
reporter.Write(cre.Report);
}

throw;
}
}
}

/// <member name="M:Cake.Core.Scripting.IScriptHost.Task(System.String)">
Expand Down
34 changes: 30 additions & 4 deletions src/Cake.Generator.Core/CakeGenerator.Generate.ScriptHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,44 @@ private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExe
public override async Task<CakeReport> RunTargetAsync(string target)
{
Settings.SetTarget(target);
var report = await Engine.RunTargetAsync(Context, strategy, Settings);
reporter.Write(report);
var report = await internalRunTargetAsync();
return report;
}

public override async Task<CakeReport> RunTargetsAsync(IEnumerable<string> targets)
{
Settings.SetTargets(targets);
var report = await Engine.RunTargetAsync(Context, strategy, Settings);
reporter.Write(report);
var report = await internalRunTargetAsync();
return report;
}

private async Task<CakeReport> internalRunTargetAsync()
{
try
{
var report = await Engine
.RunTargetAsync(Context, strategy, Settings)
.ConfigureAwait(false);

if (report != null && !report.IsEmpty)
{
reporter.Write(report);
}

ArgumentNullException.ThrowIfNull(report);

return report;
}
catch (CakeReportException cre)
{
if (cre.Report != null && !cre.Report.IsEmpty)
{
reporter.Write(cre.Report);
}

throw;
}
}
}
""");

Expand Down