Skip to content

Update UseExceptionThrowHelpers to only recommend ANE for classes #6314

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
stephentoub merged 2 commits into from
Dec 9, 2022
Merged

Update UseExceptionThrowHelpers to only recommend ANE for classes #6314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e1ba77
Update UseExceptionThrowHelpers to only recommend ANE for classes
stephentoub Dec 9, 2022
85a4a54
Address PR feedback
stephentoub Dec 9, 2022
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
3 changes: 2 additions & 1 deletion src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ aooreThrowIfGreaterThan is not null || aooreThrowIfGreaterThanOrEqual is not nul
if (SymbolEqualityComparer.Default.Equals(objectCreationOperation.Type, ane))
{
if (aneThrowIfNull is not null &&
IsParameterNullCheck(condition.Condition, out IParameterReferenceOperation? nullCheckParameter))
IsParameterNullCheck(condition.Condition, out IParameterReferenceOperation? nullCheckParameter) &&
nullCheckParameter.Type.IsReferenceType)
{
context.ReportDiagnostic(condition.CreateDiagnostic(
UseArgumentNullExceptionThrowIfNullRule,
Expand Down
66 changes: 66 additions & 0 deletions ...tAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,39 @@ string this[string name]
return name;
}
}

void NullableArg(int? arg)
{
if (arg is null) throw new ArgumentNullException(nameof(arg));
}

void GenericMethod<T>(T arg)
{
if (arg is null) throw new ArgumentNullException(nameof(arg));
}

void GenericMethodWithClassConstraint<T>(T arg) where T : class
{
{|CA1510:if (arg is null) throw new ArgumentNullException(nameof(arg));|}
}

void GenericMethodWithTypeConstraint<T>(T arg) where T : C
{
{|CA1510:if (arg is null) throw new ArgumentNullException(nameof(arg));|}
}

void GenericMethodWithInterfaceConstraint<T>(T arg) where T : IDisposable
{
if (arg is null) throw new ArgumentNullException(nameof(arg));
}
}

class GenericType<T>
{
void M(T arg)
{
if (arg is null) throw new ArgumentNullException(nameof(arg));
}
}
",
FixedCode =
Expand Down Expand Up @@ -260,6 +293,39 @@ string this[string name]
return name;
}
}

void NullableArg(int? arg)
{
if (arg is null) throw new ArgumentNullException(nameof(arg));
}

void GenericMethod<T>(T arg)
{
if (arg is null) throw new ArgumentNullException(nameof(arg));
}

void GenericMethodWithClassConstraint<T>(T arg) where T : class
{
ArgumentNullException.ThrowIfNull(arg);
}

void GenericMethodWithTypeConstraint<T>(T arg) where T : C
{
ArgumentNullException.ThrowIfNull(arg);
}

void GenericMethodWithInterfaceConstraint<T>(T arg) where T : IDisposable
{
if (arg is null) throw new ArgumentNullException(nameof(arg));
}
}

class GenericType<T>
{
void M(T arg)
{
if (arg is null) throw new ArgumentNullException(nameof(arg));
}
}
"
}.RunAsync();
Expand Down