Skip to content
Merged
Show file tree
Hide file tree
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 @@ -58,7 +58,7 @@ private static void Analyze(SyntaxNodeAnalysisContext context)

if (mockedMethodArguments.Count != lambdaParameters.Count)
{
Diagnostic diagnostic = callbackLambda.ParameterList.GetLocation().CreateDiagnostic(Rule);
Diagnostic diagnostic = callbackLambda.ParameterList.CreateDiagnostic(Rule);
context.ReportDiagnostic(diagnostic);
}
else
Expand Down Expand Up @@ -96,7 +96,7 @@ private static void ValidateParameters(

if (!HasConversion(context.SemanticModel, mockedMethodTypeSymbol, lambdaParameterTypeSymbol))
{
Diagnostic diagnostic = lambdaParameters[argumentIndex].GetLocation().CreateDiagnostic(Rule);
Diagnostic diagnostic = lambdaParameters[argumentIndex].CreateDiagnostic(Rule);
context.ReportDiagnostic(diagnostic);
}
}
Expand Down
44 changes: 24 additions & 20 deletions src/Moq.Analyzers/Common/DiagnosticExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,20 @@ internal static class DiagnosticExtensions
public static Diagnostic CreateDiagnostic(
this SyntaxNode node,
DiagnosticDescriptor rule,
params object?[]? messageArgs)
=> node.CreateDiagnostic(rule, properties: null, messageArgs);
params object?[]? messageArgs) => node.CreateDiagnostic(rule, properties: null, messageArgs);

public static Diagnostic CreateDiagnostic(
this SyntaxNode node,
DiagnosticDescriptor rule,
ImmutableDictionary<string, string?>? properties,
params object?[]? messageArgs)
=> node.CreateDiagnostic(rule, additionalLocations: Array.Empty<Location>(), properties, messageArgs);
params object?[]? messageArgs) => node.CreateDiagnostic(rule, additionalLocations: null, properties, messageArgs);

public static Diagnostic CreateDiagnostic(
this SyntaxNode node,
DiagnosticDescriptor rule,
IEnumerable<Location>? additionalLocations,
ImmutableDictionary<string, string?>? properties,
params object?[]? messageArgs)
=> node
params object?[]? messageArgs) => node
.GetLocation()
.CreateDiagnostic(
rule: rule,
Expand All @@ -32,19 +29,13 @@ public static Diagnostic CreateDiagnostic(
public static Diagnostic CreateDiagnostic(
this Location location,
DiagnosticDescriptor rule,
params object?[]? messageArgs)
=> location
.CreateDiagnostic(
rule: rule,
properties: ImmutableDictionary<string, string?>.Empty,
messageArgs: messageArgs);
params object?[]? messageArgs) => location.CreateDiagnostic(rule, properties: null, messageArgs);

public static Diagnostic CreateDiagnostic(
this Location location,
DiagnosticDescriptor rule,
ImmutableDictionary<string, string?>? properties,
params object?[]? messageArgs)
=> location.CreateDiagnostic(rule, Array.Empty<Location>(), properties, messageArgs);
params object?[]? messageArgs) => location.CreateDiagnostic(rule, additionalLocations: null, properties, messageArgs);

public static Diagnostic CreateDiagnostic(
this Location location,
Expand All @@ -58,11 +49,24 @@ public static Diagnostic CreateDiagnostic(
location = Location.None;
}

return Diagnostic.Create(
descriptor: rule,
location: location,
additionalLocations: additionalLocations,
properties: properties,
messageArgs: messageArgs);
return Diagnostic.Create(rule, location, additionalLocations, properties, messageArgs);
}

public static Diagnostic CreateDiagnostic(
this IOperation operation,
DiagnosticDescriptor rule,
params object?[]? messageArgs) => operation.CreateDiagnostic(rule, properties: null, messageArgs);

public static Diagnostic CreateDiagnostic(
this IOperation operation,
DiagnosticDescriptor rule,
ImmutableDictionary<string, string?>? properties,
params object?[]? messageArgs) => operation.CreateDiagnostic(rule, additionalLocations: null, properties, messageArgs);

public static Diagnostic CreateDiagnostic(
this IOperation operation,
DiagnosticDescriptor rule,
IEnumerable<Location>? additionalLocations,
ImmutableDictionary<string, string?>? properties,
params object?[]? messageArgs) => operation.Syntax.CreateDiagnostic(rule, additionalLocations, properties, messageArgs);
}
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private static void VerifyDelegateMockAttempt(
return;
}

Diagnostic? diagnostic = argumentList?.GetLocation().CreateDiagnostic(ClassMustHaveMatchingConstructor, argumentList);
Diagnostic? diagnostic = argumentList?.CreateDiagnostic(ClassMustHaveMatchingConstructor, argumentList);
if (diagnostic != null)
{
context.ReportDiagnostic(diagnostic);
Expand All @@ -157,7 +157,7 @@ private static void VerifyInterfaceMockAttempt(
return;
}

Diagnostic? diagnostic = argumentList?.GetLocation().CreateDiagnostic(InterfaceMustNotHaveConstructorParameters, argumentList);
Diagnostic? diagnostic = argumentList?.CreateDiagnostic(InterfaceMustNotHaveConstructorParameters, argumentList);
if (diagnostic != null)
{
context.ReportDiagnostic(diagnostic);
Expand Down
4 changes: 2 additions & 2 deletions src/Moq.Analyzers/SetExplicitMockBehaviorAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private static void AnalyzeNewObject(OperationAnalysisContext context, Immutable
}
}

context.ReportDiagnostic(creationOperation.Syntax.GetLocation().CreateDiagnostic(Rule));
context.ReportDiagnostic(creationOperation.CreateDiagnostic(Rule));
}

private static void AnalyzeInvocation(OperationAnalysisContext context, ImmutableArray<IMethodSymbol> wellKnownOfMethods, INamedTypeSymbol mockBehaviorSymbol)
Expand Down Expand Up @@ -126,7 +126,7 @@ private static void AnalyzeInvocation(OperationAnalysisContext context, Immutabl
}
}

context.ReportDiagnostic(invocationOperation.Syntax.GetLocation().CreateDiagnostic(Rule));
context.ReportDiagnostic(invocationOperation.CreateDiagnostic(Rule));
}

private static bool IsExplicitBehavior(string symbolName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private static void Analyze(SyntaxNodeAnalysisContext context)
return;
}

Diagnostic diagnostic = mockedMemberExpression.GetLocation().CreateDiagnostic(Rule);
Diagnostic diagnostic = mockedMemberExpression.CreateDiagnostic(Rule);
context.ReportDiagnostic(diagnostic);
}
}