Skip to content

Commit 42cc5f8

Browse files
committed
Simplify.
1 parent 02833be commit 42cc5f8

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

IDisposableAnalyzers/Analyzers/CreationAnalyzer.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,16 @@ when context.SemanticModel.TryGetSymbol(expression, context.CancellationToken, o
7070

7171
private static bool IsStaticFieldInitializer(ObjectCreationExpressionSyntax objectCreation)
7272
{
73-
return objectCreation.Parent is EqualsValueClauseSyntax equalsValueClause &&
74-
equalsValueClause.Parent is VariableDeclaratorSyntax variableDeclarator &&
75-
variableDeclarator.Parent is VariableDeclarationSyntax variableDeclaration &&
76-
variableDeclaration.Parent is FieldDeclarationSyntax fieldDeclaration &&
73+
return objectCreation.Parent is EqualsValueClauseSyntax { Parent: VariableDeclaratorSyntax { Parent: VariableDeclarationSyntax { Parent: FieldDeclarationSyntax fieldDeclaration } } } &&
7774
fieldDeclaration.Modifiers.Any(SyntaxKind.StaticKeyword);
7875
}
7976

8077
private static bool IsStaticPropertyInitializer(ObjectCreationExpressionSyntax objectCreation)
8178
{
82-
return objectCreation.Parent is EqualsValueClauseSyntax equalsValueClause &&
83-
equalsValueClause.Parent is PropertyDeclarationSyntax propertyDeclaration &&
79+
return objectCreation.Parent is EqualsValueClauseSyntax { Parent: PropertyDeclarationSyntax propertyDeclaration } &&
8480
propertyDeclaration.Modifiers.Any(SyntaxKind.StaticKeyword);
8581
}
8682

87-
private static bool IsStaticCtor(ISymbol containingSymbol) => containingSymbol.IsStatic &&
88-
containingSymbol is IMethodSymbol method &&
89-
method.MethodKind == MethodKind.SharedConstructor;
83+
private static bool IsStaticCtor(ISymbol containingSymbol) => containingSymbol is IMethodSymbol { IsStatic: true, MethodKind: MethodKind.SharedConstructor };
9084
}
9185
}

IDisposableAnalyzers/Helpers/Disposable.IsCreation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal static Result IsAlreadyAssignedWithCreated(ExpressionSyntax disposable,
1717
return Result.No;
1818
}
1919

20-
if (disposable is { Parent: AssignmentExpressionSyntax { Parent: ArrowExpressionClauseSyntax { Parent: ConstructorDeclarationSyntax _} } })
20+
if (disposable is { Parent: AssignmentExpressionSyntax { Parent: ArrowExpressionClauseSyntax { Parent: ConstructorDeclarationSyntax _ } } })
2121
{
2222
assignedSymbol = null;
2323
return Result.No;

0 commit comments

Comments
 (0)