Skip to content

Commit 5a7ddf8

Browse files
committed
fix warnings
1 parent 22b477b commit 5a7ddf8

7 files changed

+9
-14
lines changed

WpfAnalyzers/Analyzers/PropertyMetadataAnalyzer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ public override void Initialize(AnalysisContext context)
3131
private static void Handle(SyntaxNodeAnalysisContext context)
3232
{
3333
if (!context.IsExcludedFromAnalysis() &&
34-
context.Node is ObjectCreationExpressionSyntax objectCreation &&
35-
context.ContainingSymbol is { IsStatic: true } &&
34+
context is { Node: ObjectCreationExpressionSyntax objectCreation, ContainingSymbol.IsStatic: true } &&
3635
PropertyMetadata.Match(objectCreation, context.SemanticModel, context.CancellationToken) is { } propertyMetadata)
3736
{
3837
if (propertyMetadata.FindRegisteredName(context.SemanticModel, context.CancellationToken) is { Value: { } registeredName })

WpfAnalyzers/Analyzers/RegistrationAnalyzer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public override void Initialize(AnalysisContext context)
3030
private static void Handle(SyntaxNodeAnalysisContext context)
3131
{
3232
if (!context.IsExcludedFromAnalysis() &&
33-
context.Node is InvocationExpressionSyntax invocation &&
34-
context.ContainingSymbol is { IsStatic: true } &&
33+
context is { Node: InvocationExpressionSyntax invocation, ContainingSymbol.IsStatic: true } &&
3534
DependencyProperty.Register.MatchAny(invocation, context.SemanticModel, context.CancellationToken) is { NameArgument: { } nameArgument } register &&
3635
register.PropertyName(context.SemanticModel, context.CancellationToken) is { } registeredName)
3736
{

WpfAnalyzers/Analyzers/RoutedEventBackingFieldOrPropertyAnalyzer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public override void Initialize(AnalysisContext context)
3030
private static void Handle(SyntaxNodeAnalysisContext context)
3131
{
3232
if (!context.IsExcludedFromAnalysis() &&
33-
context.Node is MemberDeclarationSyntax memberDeclaration &&
34-
context.ContainingSymbol is { } &&
33+
context is { Node: MemberDeclarationSyntax memberDeclaration, ContainingSymbol: not null } &&
3534
FieldOrProperty.TryCreate(context.ContainingSymbol, out var backing) &&
3635
backing.Type == KnownSymbols.RoutedEvent &&
3736
backing.Value(context.CancellationToken) is InvocationExpressionSyntax invocation &&

WpfAnalyzers/Analyzers/RoutedEventEventDeclarationAnalyzer.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ public override void Initialize(AnalysisContext context)
2828
private static void Handle(SyntaxNodeAnalysisContext context)
2929
{
3030
if (!context.IsExcludedFromAnalysis() &&
31-
context.ContainingSymbol is IEventSymbol eventSymbol &&
32-
context.Node is EventDeclarationSyntax eventDeclaration &&
31+
context is { ContainingSymbol: IEventSymbol eventSymbol, Node: EventDeclarationSyntax eventDeclaration } &&
3332
EventDeclarationWalker.TryGetCalls(eventDeclaration, out var addCall, out var removeCall))
3433
{
3534
if (addCall.TryGetMethodName(out var addName) &&
@@ -65,8 +64,7 @@ addArg.Expression is IdentifierNameSyntax addIdentifier &&
6564
removeIdentifier.Identifier.ValueText));
6665
}
6766
else if (eventDeclaration.Parent is TypeDeclarationSyntax typeDeclaration &&
68-
BackingFieldWalker.TryGetRegistration(typeDeclaration, addIdentifier.Identifier.ValueText, out var registration) &&
69-
registration.ArgumentList is { })
67+
BackingFieldWalker.TryGetRegistration(typeDeclaration, addIdentifier.Identifier.ValueText, out var registration))
7068
{
7169
if (registration.TryGetArgumentAtIndex(0, out var nameARg) &&
7270
nameARg.TryGetStringValue(context.SemanticModel, context.CancellationToken, out var registeredName) &&

WpfAnalyzers/CodeFixes/AttachedPropertyBrowsableForTypeAttributeFix.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ protected override async Task RegisterCodeFixesAsync(DocumentEditorCodeFixContex
3131
if (syntaxRoot is { } &&
3232
syntaxRoot.TryFindNodeOrAncestor(diagnostic, out MethodDeclarationSyntax? methodDeclaration) &&
3333
methodDeclaration.ParameterList is { } parameterList &&
34-
parameterList.Parameters.TrySingle(out var parameter))
34+
parameterList.Parameters.TrySingle(out var parameter) &&
35+
parameter.Type is { })
3536
{
3637
context.RegisterCodeFix(
3738
$"Add [AttachedPropertyBrowsableForType(typeof({parameter.Type}))].",

WpfAnalyzers/CodeFixes/UseNameofFix.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ async Task FixAsync(DocumentEditor editor, CancellationToken cancellationToken)
4949

5050
if (!expression!.IsInStaticContext() &&
5151
editor.SemanticModel.LookupSymbols(expression!.SpanStart, name: name).TrySingle(out var member) &&
52-
(member is IFieldSymbol || member is IPropertySymbol || member is IMethodSymbol) &&
52+
member is IFieldSymbol or IPropertySymbol or IMethodSymbol &&
5353
!member.IsStatic &&
5454
await Qualify(member).ConfigureAwait(false) != CodeStyleResult.No)
5555
{

WpfAnalyzers/WPF0011ContainingTypeShouldBeRegisteredOwner.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ public override void Initialize(AnalysisContext context)
2525
private static void Handle(SyntaxNodeAnalysisContext context)
2626
{
2727
if (!context.IsExcludedFromAnalysis() &&
28-
context.Node is InvocationExpressionSyntax invocation &&
29-
context.ContainingSymbol is { IsStatic: true })
28+
context is { Node: InvocationExpressionSyntax invocation, ContainingSymbol.IsStatic: true })
3029
{
3130
if (DependencyProperty.Register.MatchAny(invocation, context.SemanticModel, context.CancellationToken) is { OwnerTypeArgument: { } ownerTypeArgument })
3231
{

0 commit comments

Comments
 (0)