Skip to content

Standardize argument-name validation in OutputBuilderFactory #714

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
tannergooding merged 1 commit into from
Jul 13, 2026
Merged

Standardize argument-name validation in OutputBuilderFactory #714

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: 19 additions & 15 deletions sources/ClangSharp.PInvokeGenerator/OutputBuilderFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ internal sealed class OutputBuilderFactory(PInvokeGenerator generator)

public IOutputBuilder Create(string name)
{
if (string.IsNullOrWhiteSpace(name))
{
throw new ArgumentNullException(nameof(name));
}
ValidateName(name);

var outputBuilder = generator.Config.OutputMode switch
{
Expand All @@ -38,32 +35,39 @@ public IOutputBuilder Create(string name)

public CSharpOutputBuilder CreateTests(string name)
{
if (string.IsNullOrWhiteSpace(name))
{
throw new ArgumentNullException(nameof(name));
}
ValidateName(name);

var outputBuilder = new CSharpOutputBuilder(name, generator, isTestOutput: true, writeSourceLocation: _writeSourceLocation);

_outputBuilders.Add(name, outputBuilder);
return outputBuilder;
}

public IOutputBuilder GetOutputBuilder(string name) => string.IsNullOrWhiteSpace(name) ? throw new ArgumentNullException(nameof(name)) : _outputBuilders[name];
public IOutputBuilder GetOutputBuilder(string name)
{
ValidateName(name);
return _outputBuilders[name];
}

public CSharpOutputBuilder GetTestOutputBuilder(string name)
{
return string.IsNullOrWhiteSpace(name)
? throw new ArgumentNullException(nameof(name))
: _outputBuilders[name] is CSharpOutputBuilder csharpOutputBuilder && csharpOutputBuilder.IsTestOutput
ValidateName(name);
return _outputBuilders[name] is CSharpOutputBuilder csharpOutputBuilder && csharpOutputBuilder.IsTestOutput
? csharpOutputBuilder
: throw new ArgumentException("A test output builder was not found with the given name", nameof(name));
}

public bool TryGetOutputBuilder(string name, [MaybeNullWhen(false)] out IOutputBuilder outputBuilder)
{
return string.IsNullOrWhiteSpace(name)
? throw new ArgumentNullException(nameof(name))
: _outputBuilders.TryGetValue(name, out outputBuilder);
ValidateName(name);
return _outputBuilders.TryGetValue(name, out outputBuilder);
}

private static void ValidateName([NotNull] string name)
{
if (string.IsNullOrWhiteSpace(name))
{
throw new ArgumentNullException(nameof(name));
}
}
}
Loading