Skip to content

Remove some redundant immutable array allocation #4988

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

Open
SimonCropp wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove some redundant immutable array allocation #4988

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
6e12ddd
remove some redundant ImmutableArray allocation
SimonCropp Feb 23, 2026
4c886de
remove some redundant ImmutableArray allocation
SimonCropp Feb 23, 2026
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
2 changes: 1 addition & 1 deletion TUnit.Analyzers/TestDataAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private void AnalyzeMethod(SymbolAnalysisContext context)

var attributes = methodSymbol.GetAttributes();

Analyze(context, attributes, methodSymbol.Parameters.WithoutCancellationTokenParameter().ToImmutableArray(), null, methodSymbol.ContainingType);
Analyze(context, attributes, methodSymbol.Parameters.WithoutCancellationTokenParameter(), null, methodSymbol.ContainingType);
}

private void AnalyzeProperty(SymbolAnalysisContext context)
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Assertions.SourceGenerator/Generators/AssertionMethodGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
predicate: (node, _) => node is ClassDeclarationSyntax,
transform: (ctx, _) => GetGenericCreateAssertionAttributeData(ctx, "AssertionFromAttribute"))
.Where(x => x != null)
.SelectMany((x, _) => x!.ToImmutableArray());
.SelectMany((x, _) => x!);

// Combine all sources
var allAttributeData = nonGenericAssertionFromData.Collect()
Expand Down
10 changes: 5 additions & 5 deletions TUnit.Core.SourceGenerator/Generators/PropertyInjectionSourceGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
.CreateSyntaxProvider(
predicate: static (node, _) => node is TypeDeclarationSyntax or PropertyDeclarationSyntax,
transform: static (ctx, _) => ExtractConcreteGenericTypes(ctx))
.Where(static x => x.Length > 0)
.Where(static x => x.Count > 0)
.SelectMany(static (types, _) => types);

// Collect and deduplicate by fully qualified type name
Expand Down Expand Up @@ -326,17 +326,17 @@ private static IEnumerable<ClassPropertyInjectionModel> GroupPropertiesByClass(
/// 1. Inheritance chains (base types)
/// 2. IDataSourceAttribute type arguments
/// </summary>
private static ImmutableArray<ConcreteGenericTypeModel> ExtractConcreteGenericTypes(GeneratorSyntaxContext context)
private static List<ConcreteGenericTypeModel> ExtractConcreteGenericTypes(GeneratorSyntaxContext context)
{
var semanticModel = context.SemanticModel;
var results = new List<ConcreteGenericTypeModel>();

var dataSourceInterface = semanticModel.Compilation.GetTypeByMetadataName("TUnit.Core.IDataSourceAttribute");
var asyncInitializerInterface = semanticModel.Compilation.GetTypeByMetadataName("TUnit.Core.Interfaces.IAsyncInitializer");

if (dataSourceInterface == null || asyncInitializerInterface == null)
return ImmutableArray<ConcreteGenericTypeModel>.Empty;
return [];

var results = new List<ConcreteGenericTypeModel>();
// Discovery from type declarations (inheritance chains)
if (context.Node is TypeDeclarationSyntax typeDecl)
{
Expand Down Expand Up @@ -432,7 +432,7 @@ private static ImmutableArray<ConcreteGenericTypeModel> ExtractConcreteGenericTy
}
}

return results.Count > 0 ? results.ToImmutableArray() : ImmutableArray<ConcreteGenericTypeModel>.Empty;
return results;
}

/// <summary>
Expand Down
3 changes: 1 addition & 2 deletions TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5039,8 +5039,7 @@ private static void GenerateConcreteTestMetadataForNonGeneric(

var attributes = filteredMethodAttributes
.Concat(filteredClassAttributes)
.Concat(testMethod.TypeSymbol.ContainingAssembly.GetAttributes())
.ToImmutableArray();
.Concat(testMethod.TypeSymbol.ContainingAssembly.GetAttributes());

testMethod.CompilationContext.AttributeWriter.WriteAttributes(writer, attributes);

Expand Down