Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,27 @@ public sealed override void Initialize(AnalysisContext context)

// When compilation begins, check whether Array.Empty<T> is available.
// Only if it is, register the syntax node action provided by the derived implementations.
context.RegisterCompilationStartAction(ctx =>
context.RegisterCompilationStartAction(context =>
{
INamedTypeSymbol typeSymbol = ctx.Compilation.GetSpecialType(SpecialType.System_Array);
INamedTypeSymbol typeSymbol = context.Compilation.GetSpecialType(SpecialType.System_Array);
if (typeSymbol.DeclaredAccessibility == Accessibility.Public)
{
if (typeSymbol.GetMembers(ArrayEmptyMethodName).FirstOrDefault() is IMethodSymbol methodSymbol && methodSymbol.DeclaredAccessibility == Accessibility.Public &&
methodSymbol.IsStatic && methodSymbol.Arity == 1 && methodSymbol.Parameters.IsEmpty)
{
ctx.RegisterOperationAction(c => AnalyzeOperation(c, methodSymbol), OperationKind.ArrayCreation);
var linqExpressionType = context.Compilation.GetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemLinqExpressionsExpression1);
context.RegisterOperationAction(c => AnalyzeOperation(c, methodSymbol, linqExpressionType), OperationKind.ArrayCreation);
}
}
});
}

private void AnalyzeOperation(OperationAnalysisContext context, IMethodSymbol arrayEmptyMethodSymbol)
private void AnalyzeOperation(OperationAnalysisContext context, IMethodSymbol arrayEmptyMethodSymbol, INamedTypeSymbol? linqExpressionType)
{
AnalyzeOperation(context, arrayEmptyMethodSymbol, IsAttributeSyntax);
AnalyzeOperation(context, arrayEmptyMethodSymbol, linqExpressionType, IsAttributeSyntax);
}

private static void AnalyzeOperation(OperationAnalysisContext context, IMethodSymbol arrayEmptyMethodSymbol, Func<SyntaxNode, bool> isAttributeSyntax)
private static void AnalyzeOperation(OperationAnalysisContext context, IMethodSymbol arrayEmptyMethodSymbol, INamedTypeSymbol? linqExpressionType, Func<SyntaxNode, bool> isAttributeSyntax)
{
IArrayCreationOperation arrayCreationExpression = (IArrayCreationOperation)context.Operation;

Expand All @@ -80,7 +81,6 @@ private static void AnalyzeOperation(OperationAnalysisContext context, IMethodSy
return;
}

var linqExpressionType = context.Compilation.GetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemLinqExpressionsExpression1);
if (arrayCreationExpression.IsWithinExpressionTree(linqExpressionType))
{
return;
Expand Down