Skip to content

Fix params array argument handling in source generator #2789

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
thomhurst merged 4 commits into from
Aug 6, 2025
Merged

Fix params array argument handling in source generator #2789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98afb7f
Initial plan
Copilot Aug 6, 2025
8cb2620
Fix params array argument handling in source generator
Copilot Aug 6, 2025
0628a37
Complete fix for params array argument handling
Copilot Aug 6, 2025
f4a34c9
Regenerate source generator snapshots after params array fix
Copilot Aug 6, 2025
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
22 changes: 17 additions & 5 deletions TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <auto-generated/>
// <auto-generated/>
#pragma warning disable

// <auto-generated/>
Expand Down Expand Up @@ -90,6 +90,9 @@ return classMetadata;
// Invoke with only the arguments that were provided
switch (args.Length)
{
case 0:
typedInstance.Params(new string[0]);
break;
case 1:
typedInstance.Params(TUnit.Core.Helpers.CastHelper.Cast<string[]>(args[0]));
break;
Expand All @@ -109,7 +112,7 @@ return classMetadata;
typedInstance.Params(new string[] { TUnit.Core.Helpers.CastHelper.Cast<string>(args[0]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[1]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[2]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[3]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[4]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[5]) });
break;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
throw new global::System.ArgumentException($"Expected between 0 and 1 arguments, but got {args.Length}");
}
await global::System.Threading.Tasks.Task.CompletedTask;
},
Expand All @@ -118,6 +121,9 @@ return classMetadata;
// Invoke with only the arguments that were provided
switch (args.Length)
{
case 0:
instance.Params(new string[0]);
break;
case 1:
instance.Params(TUnit.Core.Helpers.CastHelper.Cast<string[]>(args[0]));
break;
Expand All @@ -137,7 +143,7 @@ return classMetadata;
instance.Params(new string[] { TUnit.Core.Helpers.CastHelper.Cast<string>(args[0]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[1]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[2]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[3]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[4]), TUnit.Core.Helpers.CastHelper.Cast<string>(args[5]) });
break;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
throw new global::System.ArgumentException($"Expected between 0 and 1 arguments, but got {args.Length}");
}
await global::System.Threading.Tasks.Task.CompletedTask;
},
Expand Down Expand Up @@ -382,6 +388,9 @@ return classMetadata;
// Invoke with only the arguments that were provided
switch (args.Length)
{
case 0:
typedInstance.ParamsEnumerable(TUnit.Core.Helpers.CastHelper.Cast<global::System.Collections.Generic.IEnumerable<string>>(args[0]));
break;
case 1:
typedInstance.ParamsEnumerable(TUnit.Core.Helpers.CastHelper.Cast<global::System.Collections.Generic.IEnumerable<string>>(args[0]));
break;
Expand All @@ -401,7 +410,7 @@ return classMetadata;
typedInstance.ParamsEnumerable(TUnit.Core.Helpers.CastHelper.Cast<global::System.Collections.Generic.IEnumerable<string>>(args[0]));
break;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
throw new global::System.ArgumentException($"Expected between 0 and 1 arguments, but got {args.Length}");
}
await global::System.Threading.Tasks.Task.CompletedTask;
},
Expand All @@ -410,6 +419,9 @@ return classMetadata;
// Invoke with only the arguments that were provided
switch (args.Length)
{
case 0:
instance.ParamsEnumerable(TUnit.Core.Helpers.CastHelper.Cast<global::System.Collections.Generic.IEnumerable<string>>(args[0]));
break;
case 1:
instance.ParamsEnumerable(TUnit.Core.Helpers.CastHelper.Cast<global::System.Collections.Generic.IEnumerable<string>>(args[0]));
break;
Expand All @@ -429,7 +441,7 @@ return classMetadata;
instance.ParamsEnumerable(TUnit.Core.Helpers.CastHelper.Cast<global::System.Collections.Generic.IEnumerable<string>>(args[0]));
break;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
throw new global::System.ArgumentException($"Expected between 0 and 1 arguments, but got {args.Length}");
}
await global::System.Threading.Tasks.Task.CompletedTask;
},
Expand Down
22 changes: 17 additions & 5 deletions TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <auto-generated/>
// <auto-generated/>
#pragma warning disable

// <auto-generated/>
Expand Down Expand Up @@ -102,6 +102,9 @@ return classMetadata;
// Invoke with only the arguments that were provided
switch (args.Length)
{
case 1:
typedInstance.Test(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), new long[0]);
break;
case 2:
typedInstance.Test(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), TUnit.Core.Helpers.CastHelper.Cast<long[]>(args[1]));
break;
Expand All @@ -121,7 +124,7 @@ return classMetadata;
typedInstance.Test(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), new long[] { TUnit.Core.Helpers.CastHelper.Cast<long>(args[1]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[2]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[3]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[4]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[5]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[6]) });
break;
default:
throw new global::System.ArgumentException($"Expected exactly 2 arguments, but got {args.Length}");
throw new global::System.ArgumentException($"Expected between 1 and 2 arguments, but got {args.Length}");
}
await global::System.Threading.Tasks.Task.CompletedTask;
},
Expand All @@ -130,6 +133,9 @@ return classMetadata;
// Invoke with only the arguments that were provided
switch (args.Length)
{
case 1:
instance.Test(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), new long[0]);
break;
case 2:
instance.Test(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), TUnit.Core.Helpers.CastHelper.Cast<long[]>(args[1]));
break;
Expand All @@ -149,7 +155,7 @@ return classMetadata;
instance.Test(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), new long[] { TUnit.Core.Helpers.CastHelper.Cast<long>(args[1]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[2]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[3]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[4]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[5]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[6]) });
break;
default:
throw new global::System.ArgumentException($"Expected exactly 2 arguments, but got {args.Length}");
throw new global::System.ArgumentException($"Expected between 1 and 2 arguments, but got {args.Length}");
}
await global::System.Threading.Tasks.Task.CompletedTask;
},
Expand Down Expand Up @@ -275,6 +281,9 @@ return classMetadata;
// Invoke with only the arguments that were provided
switch (args.Length)
{
case 1:
typedInstance.Test2(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), new long[0]);
break;
case 2:
typedInstance.Test2(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), TUnit.Core.Helpers.CastHelper.Cast<long[]>(args[1]));
break;
Expand All @@ -294,7 +303,7 @@ return classMetadata;
typedInstance.Test2(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), new long[] { TUnit.Core.Helpers.CastHelper.Cast<long>(args[1]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[2]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[3]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[4]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[5]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[6]) });
break;
default:
throw new global::System.ArgumentException($"Expected exactly 2 arguments, but got {args.Length}");
throw new global::System.ArgumentException($"Expected between 1 and 2 arguments, but got {args.Length}");
}
await global::System.Threading.Tasks.Task.CompletedTask;
},
Expand All @@ -303,6 +312,9 @@ return classMetadata;
// Invoke with only the arguments that were provided
switch (args.Length)
{
case 1:
instance.Test2(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), new long[0]);
break;
case 2:
instance.Test2(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), TUnit.Core.Helpers.CastHelper.Cast<long[]>(args[1]));
break;
Expand All @@ -322,7 +334,7 @@ return classMetadata;
instance.Test2(TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), new long[] { TUnit.Core.Helpers.CastHelper.Cast<long>(args[1]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[2]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[3]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[4]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[5]), TUnit.Core.Helpers.CastHelper.Cast<long>(args[6]) });
break;
default:
throw new global::System.ArgumentException($"Expected exactly 2 arguments, but got {args.Length}");
throw new global::System.ArgumentException($"Expected between 1 and 2 arguments, but got {args.Length}");
}
await global::System.Threading.Tasks.Task.CompletedTask;
},
Expand Down
12 changes: 6 additions & 6 deletions TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@
}

// Find the data source method
var dataSourceMethod = targetType.GetMembers(methodName)

Check warning on line 783 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (windows-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 783 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (windows-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 783 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (windows-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 783 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (ubuntu-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 783 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (ubuntu-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 783 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (ubuntu-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 783 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (macos-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 783 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (macos-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 783 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (macos-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.
.OfType<IMethodSymbol>()
.FirstOrDefault();

Expand Down Expand Up @@ -1605,8 +1605,8 @@
}
else
{
// Count required parameters (those without default values, excluding CancellationToken)
var requiredParamCount = parametersFromArgs.Count(p => !p.HasExplicitDefaultValue && !p.IsOptional);
// Count required parameters (those without default values, excluding CancellationToken and params parameters)
var requiredParamCount = parametersFromArgs.Count(p => !p.HasExplicitDefaultValue && !p.IsOptional && !p.IsParams);

// Generate runtime logic to handle variable argument counts
writer.AppendLine("// Invoke with only the arguments that were provided");
Expand Down Expand Up @@ -1653,7 +1653,7 @@

writer.AppendLine("default:");
writer.Indent();
if (requiredParamCount == parametersFromArgs.Length)
if (requiredParamCount == parametersFromArgs.Length && !hasParams)
{
writer.AppendLine($"throw new global::System.ArgumentException($\"Expected exactly {parametersFromArgs.Length} argument{(parametersFromArgs.Length == 1 ? "" : "s")}, but got {{args.Length}}\");");
}
Expand Down Expand Up @@ -1697,8 +1697,8 @@
}
else
{
// Count required parameters (those without default values, excluding CancellationToken)
var requiredParamCount = parametersFromArgs.Count(p => !p.HasExplicitDefaultValue && !p.IsOptional);
// Count required parameters (those without default values, excluding CancellationToken and params parameters)
var requiredParamCount = parametersFromArgs.Count(p => !p.HasExplicitDefaultValue && !p.IsOptional && !p.IsParams);

// Generate runtime logic to handle variable argument counts
writer.AppendLine("// Invoke with only the arguments that were provided");
Expand Down Expand Up @@ -1745,7 +1745,7 @@

writer.AppendLine("default:");
writer.Indent();
if (requiredParamCount == parametersFromArgs.Length)
if (requiredParamCount == parametersFromArgs.Length && !hasParams)
{
writer.AppendLine($"throw new global::System.ArgumentException($\"Expected exactly {parametersFromArgs.Length} argument{(parametersFromArgs.Length == 1 ? "" : "s")}, but got {{args.Length}}\");");
}
Expand Down
26 changes: 26 additions & 0 deletions TUnit.TestProject/ParamsArgumentsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using TUnit.Core;

namespace TUnit.TestProject
{
public class ParamsArgumentsTests
{
[Test]
[Arguments(2, 2)]
[Arguments(20, 3, Operation.Kind.A)]
[Arguments(20, 6, Operation.Kind.Deposit, Operation.Kind.B)]
public void GetOperations(int dayDelta, int expectedNumberOfOperation, params Operation.Kind[] kinds)
{
// Test implementation
}
}

public class Operation
{
public enum Kind
{
A,
B,
Deposit
}
}
}
Loading