Skip to content

Commit

Permalink
simplify patterns
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohanLarsson
JohanLarsson committed Apr 13, 2023
1 parent 2305ba1 commit 7245172
Show file tree
Hide file tree
Showing 25 changed files with 78 additions and 78 deletions.
10 changes: 5 additions & 5 deletions Gu.Roslyn.AnalyzerExtensions/Equality.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ public static bool IsRuntimeHelpersEquals(InvocationExpressionSyntax candidate,

return candidate.Expression switch
{
MemberAccessExpressionSyntax { Expression: IdentifierNameSyntax { Identifier: { ValueText: "RuntimeHelpers" } } } => true,
MemberAccessExpressionSyntax { Expression: IdentifierNameSyntax { Identifier.ValueText: "RuntimeHelpers" } } => true,
MemberAccessExpressionSyntax { Expression: { } expression }
when MemberPath.TryFindLast(expression, out var last) &&
last.ValueText == "RuntimeHelpers"
Expand Down Expand Up @@ -383,7 +383,7 @@ public static bool IsNullableEquals(InvocationExpressionSyntax candidate, Semant

return candidate.Expression switch
{
MemberAccessExpressionSyntax { Expression: IdentifierNameSyntax { Identifier: { ValueText: "Nullable" } } } => true,
MemberAccessExpressionSyntax { Expression: IdentifierNameSyntax { Identifier.ValueText: "Nullable" } } => true,
MemberAccessExpressionSyntax memberAccess
when MemberPath.TryFindLast(memberAccess.Expression, out var last) &&
last.ValueText == "Nullable"
Expand Down Expand Up @@ -490,7 +490,7 @@ public static bool IsEqualityComparerEquals(InvocationExpressionSyntax candidate
bool IsCorrectSymbol()
{
return semanticModel.TryGetSymbol(candidate, cancellationToken, out var method) &&
method is { IsStatic: false, Parameters: { Length: 2 } } &&
method is { IsStatic: false, Parameters.Length: 2 } &&
method.ContainingType.Is(QualifiedType.System.Collections.Generic.IEqualityComparerOfT);
}
}
Expand Down Expand Up @@ -635,7 +635,7 @@ public static bool IsOverriden(TypeDeclarationSyntax candidate)

foreach (var member in candidate.Members)
{
if (member is MethodDeclarationSyntax { ParameterList: { Parameters: { } parameters } } method &&
if (member is MethodDeclarationSyntax { ParameterList.Parameters: { } parameters } method &&
method.Modifiers.Any(SyntaxKind.OverrideKeyword))
{
if (parameters.Count == 0 &&
Expand Down Expand Up @@ -664,7 +664,7 @@ public static bool IsOverriden(TypeDeclarationSyntax candidate)
public static bool IsOverriden(INamedTypeSymbol candidate)
{
return candidate.TryFindFirstMethod(nameof(Equals), x => x.Parameters.TrySingle(out var parameter) && parameter.Type == QualifiedType.System.Object && x.IsOverride, out _) ||
candidate.TryFindFirstMethod(nameof(GetHashCode), x => x is { IsOverride: true, Parameters: { Length: 0 } }, out _);
candidate.TryFindFirstMethod(nameof(GetHashCode), x => x is { IsOverride: true, Parameters.Length: 0 }, out _);
}

/// <summary>
Expand Down
8 changes: 4 additions & 4 deletions Gu.Roslyn.AnalyzerExtensions/MemberPath.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@ public static bool TryGetMemberName(this ExpressionSyntax expression, [NotNullWh
{
switch (expression)
{
case IdentifierNameSyntax { Identifier: { ValueText: { } valueText } }:
case IdentifierNameSyntax { Identifier.ValueText: { } valueText }:
name = valueText;
return true;
case MemberAccessExpressionSyntax { Name: { Identifier: { ValueText: { } valueText } } }:
case MemberAccessExpressionSyntax { Name.Identifier.ValueText: { } valueText }:
name = valueText;
return true;
case MemberBindingExpressionSyntax { Name: { Identifier: { ValueText: { } valueText } } }:
case MemberBindingExpressionSyntax { Name.Identifier.ValueText: { } valueText }:
name = valueText;
return true;
case ConditionalAccessExpressionSyntax { WhenNotNull: { } whenNotNull }:
Expand Down Expand Up @@ -207,7 +207,7 @@ when binary.IsKind(SyntaxKind.AsExpression):
case CastExpressionSyntax cast:
base.Visit(cast.Expression);
return;
case PostfixUnaryExpressionSyntax { OperatorToken: { ValueText: "!" } } postfix:
case PostfixUnaryExpressionSyntax { OperatorToken.ValueText: "!" } postfix:
base.Visit(postfix.Operand);
return;
case InvocationExpressionSyntax { Expression: IdentifierNameSyntax _ }:
Expand Down
2 changes: 1 addition & 1 deletion Gu.Roslyn.AnalyzerExtensions/Pooled/Recursion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ when this.Target(invocation, caller, line) is { } temp
{
if (this.visited.Add((caller, line, node)) &&
this.EffectiveSymbol<IPropertySymbol>(node) is { } property &&
property is { SetMethod: { Parameters: { Length: 1 } } set })
property is { SetMethod: { Parameters.Length: 1 } set })
{
_ = set.TrySingleDeclaration(this.CancellationToken, out AccessorDeclarationSyntax? declaration);
return AnalyzerExtensions.Target.Create(node, set.Parameters[0], declaration);
Expand Down
4 changes: 2 additions & 2 deletions Gu.Roslyn.AnalyzerExtensions/Scope.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static bool HasParameter(SyntaxNode nodeInScope, string name)
return false;
case ParenthesizedLambdaExpressionSyntax { ParameterList: { } lambdaParameters }
when HasParameter(lambdaParameters):
case SimpleLambdaExpressionSyntax { Parameter: { Identifier: { ValueText: { } valueText } } }
case SimpleLambdaExpressionSyntax { Parameter.Identifier.ValueText: { } valueText }
when valueText == name:
case LocalFunctionStatementSyntax { ParameterList: { } parameterList }
when HasParameter(parameterList):
Expand Down Expand Up @@ -181,7 +181,7 @@ public static bool IsInStaticContext(this SyntaxNode node)
{
return memberDeclaration switch
{
FieldDeclarationSyntax { Declaration: { Variables: { } variables } } declaration
FieldDeclarationSyntax { Declaration.Variables: { } variables } declaration
=> declaration.Modifiers.Any(SyntaxKind.StaticKeyword, SyntaxKind.ConstKeyword) ||
(variables.TryLast(out var last) &&
last.Initializer?.Contains(node) == true),
Expand Down
2 changes: 1 addition & 1 deletion Gu.Roslyn.AnalyzerExtensions/SemanticModelExt.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ bool CheckInner()
{
CastExpressionSyntax { Expression: { } e }
=> IsRepresentationPreservingConversion(semanticModel, e, destination),
BinaryExpressionSyntax { Left: { } e, OperatorToken: { ValueText: "as" } }
BinaryExpressionSyntax { Left: { } e, OperatorToken.ValueText: "as" }
=> IsRepresentationPreservingConversion(semanticModel, e, destination),
_ => false,
};
Expand Down
10 changes: 5 additions & 5 deletions Gu.Roslyn.AnalyzerExtensions/StyleCopComparers/FieldDeclarationComparer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ private static int CompareBackingMember(FieldDeclarationSyntax x, FieldDeclarati
private static bool TryGetMember(FieldDeclarationSyntax field, [NotNullWhen(true)] out MemberDeclarationSyntax? result)
{
result = null;
if (field is { Declaration: { Variables: { Count: 1 } variables }, Parent: { } } &&
if (field is { Declaration.Variables: { Count: 1 } variables, Parent: { } } &&
variables[0].Identifier is { ValueText: { } name })
{
using var walker = SpecificIdentifierNameWalker.Borrow(field.Parent, name);
Expand Down Expand Up @@ -180,7 +180,7 @@ private static bool TryGetMember(FieldDeclarationSyntax field, [NotNullWhen(true
return accessor.FirstAncestor<PropertyDeclarationSyntax>();
}

if (usage.Parent is ArgumentSyntax { Parent: ArgumentListSyntax { Arguments: { Count: 2 }, Parent: InvocationExpressionSyntax setValue } } &&
if (usage.Parent is ArgumentSyntax { Parent: ArgumentListSyntax { Arguments.Count: 2, Parent: InvocationExpressionSyntax setValue } } &&
setValue.TryGetMethodName(out var methodName) &&
methodName == "SetValue")
{
Expand All @@ -199,7 +199,7 @@ private static bool TryGetMember(FieldDeclarationSyntax field, [NotNullWhen(true
}
}

if (usage.Parent is ArgumentSyntax { Parent: ArgumentListSyntax { Arguments: { Count: 1 }, Parent: InvocationExpressionSyntax getValue } } &&
if (usage.Parent is ArgumentSyntax { Parent: ArgumentListSyntax { Arguments.Count: 1, Parent: InvocationExpressionSyntax getValue } } &&
getValue.TryGetMethodName(out methodName) &&
methodName == "GetValue")
{
Expand All @@ -224,8 +224,8 @@ bool IsAssigning()
{
return usage switch
{
{ Parent: AssignmentExpressionSyntax { Right: IdentifierNameSyntax { Identifier: { ValueText: "value" } } } } => true,
{ Parent: ArgumentSyntax { RefKindKeyword: { ValueText: "ref" }, Parent: ArgumentListSyntax { Arguments: { } arguments } } }
{ Parent: AssignmentExpressionSyntax { Right: IdentifierNameSyntax { Identifier.ValueText: "value" } } } => true,
{ Parent: ArgumentSyntax { RefKindKeyword.ValueText: "ref", Parent: ArgumentListSyntax { Arguments: { } arguments } } }
when arguments.Count >= 2
=> true,
_ => false,
Expand Down
30 changes: 15 additions & 15 deletions Gu.Roslyn.AnalyzerExtensions/StyleCopComparers/MethodDeclarationComparer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static bool HasSystemWindows(SyntaxList<UsingDirectiveSyntax> usings)
{
foreach (var @using in usings)
{
if (@using.Name is QualifiedNameSyntax { Left: IdentifierNameSyntax { Identifier: { ValueText: "System" } }, Right: IdentifierNameSyntax { Identifier: { ValueText: "Windows" } } })
if (@using.Name is QualifiedNameSyntax { Left: IdentifierNameSyntax { Identifier.ValueText: "System" }, Right: IdentifierNameSyntax { Identifier.ValueText: "Windows" } })
{
return true;
}
Expand Down Expand Up @@ -100,30 +100,30 @@ private static bool TryGetWpfSortIndex(MethodDeclarationSyntax method, out long
long callbackStart = int.MaxValue;
result = method switch
{
{ Identifier: { ValueText: { } name }, ParameterList: { Parameters: { Count: 1 } } }
{ Identifier.ValueText: { } name, ParameterList.Parameters.Count: 1 }
when name.StartsWith("Get", StringComparison.Ordinal) &&
FindInvocation(method, "GetValue") is { ArgumentList: { Arguments: { Count: 1 } arguments } } &&
FindInvocation(method, "GetValue") is { ArgumentList.Arguments: { Count: 1 } arguments } &&
arguments[0].Expression is IdentifierNameSyntax fieldName &&
FindDeclaration(fieldName) is { } field
=> field.SpanStart,
{ ReturnType: PredefinedTypeSyntax { Keyword: { ValueText: "void" } }, Identifier: { ValueText: { } name }, ParameterList: { Parameters: { Count: 2 } parameters } }
{ ReturnType: PredefinedTypeSyntax { Keyword.ValueText: "void" }, Identifier.ValueText: { } name, ParameterList.Parameters: { Count: 2 } parameters }
when
name.StartsWith("Set", StringComparison.Ordinal) && FindInvocation(method, "SetValue") is { ArgumentList: { Arguments: { Count: 2 } arguments } } &&
name.StartsWith("Set", StringComparison.Ordinal) && FindInvocation(method, "SetValue") is { ArgumentList.Arguments: { Count: 2 } arguments } &&
arguments[0].Expression is IdentifierNameSyntax fieldName && arguments[1].Expression is IdentifierNameSyntax arg1 &&
arg1.Identifier.ValueText == parameters[1].Identifier.ValueText && FindDeclaration(fieldName) is { } field
=> field.Declaration.SpanStart,
{ ReturnType: PredefinedTypeSyntax { Keyword: { ValueText: "void" } }, ParameterList: { Parameters: { Count: 2 } parameters } }
when parameters[0].Type is IdentifierNameSyntax { Identifier: { ValueText: "DependencyObject" } } &&
parameters[1].Type is IdentifierNameSyntax { Identifier: { ValueText: "DependencyPropertyChangedEventArgs" } } &&
{ ReturnType: PredefinedTypeSyntax { Keyword.ValueText: "void" }, ParameterList.Parameters: { Count: 2 } parameters }
when parameters[0].Type is IdentifierNameSyntax { Identifier.ValueText: "DependencyObject" } &&
parameters[1].Type is IdentifierNameSyntax { Identifier.ValueText: "DependencyPropertyChangedEventArgs" } &&
FindCallbackInvocation() is { } usage
=> callbackStart + usage.SpanStart,
{ ReturnType: PredefinedTypeSyntax { Keyword: { ValueText: "object" } }, ParameterList: { Parameters: { Count: 2 } parameters } }
when parameters[0].Type is IdentifierNameSyntax { Identifier: { ValueText: "DependencyObject" } } &&
parameters[1].Type is PredefinedTypeSyntax { Keyword: { ValueText: "object" } } &&
{ ReturnType: PredefinedTypeSyntax { Keyword.ValueText: "object" }, ParameterList.Parameters: { Count: 2 } parameters }
when parameters[0].Type is IdentifierNameSyntax { Identifier.ValueText: "DependencyObject" } &&
parameters[1].Type is PredefinedTypeSyntax { Keyword.ValueText: "object" } &&
FindCallbackInvocation() is { } usage
=> callbackStart + usage.SpanStart,
{ ReturnType: PredefinedTypeSyntax { Keyword: { ValueText: "bool" } }, ParameterList: { Parameters: { Count: 1 } parameters } }
when parameters[0].Type is PredefinedTypeSyntax { Keyword: { ValueText: "object" } } &&
{ ReturnType: PredefinedTypeSyntax { Keyword.ValueText: "bool" }, ParameterList.Parameters: { Count: 1 } parameters }
when parameters[0].Type is PredefinedTypeSyntax { Keyword.ValueText: "object" } &&
FindCallbackInvocation() is { } usage
=> callbackStart + usage.SpanStart,
_ => -1,
Expand Down Expand Up @@ -159,8 +159,8 @@ arguments[0].Expression is IdentifierNameSyntax fieldName && arguments[1].Expres
return expression switch
{
IdentifierNameSyntax identifierName
when FindField(identifierName.Identifier.ValueText) is { Declaration: { Variables: { Count: 1 } variables } } field &&
variables[0] is { Initializer: { Value: { } value } }
when FindField(identifierName.Identifier.ValueText) is { Declaration.Variables: { Count: 1 } variables } field &&
variables[0] is { Initializer.Value: { } value }
=>
value switch
{
Expand Down
2 changes: 1 addition & 1 deletion Gu.Roslyn.AnalyzerExtensions/Symbols/Constructor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static bool TryFindDefault(INamedTypeSymbol type, Search search, [NotNull
{
foreach (var candidate in type.Constructors)
{
if (candidate is { Parameters: { Length: 0 }, DeclaringSyntaxReferences: { Length: 1 } } &&
if (candidate is { Parameters.Length: 0, DeclaringSyntaxReferences.Length: 1 } &&
NamedTypeSymbolComparer.Equal(candidate.ContainingType, type))
{
result = candidate;
Expand Down
2 changes: 1 addition & 1 deletion Gu.Roslyn.AnalyzerExtensions/Symbols/IParameterSymbolExt.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static bool IsCallerMemberName(this IParameterSymbol parameter)
throw new System.ArgumentNullException(nameof(parameter));
}

if (parameter is { Type: { SpecialType: SpecialType.System_String }, HasExplicitDefaultValue: true })
if (parameter is { Type.SpecialType: SpecialType.System_String, HasExplicitDefaultValue: true })
{
foreach (var attribute in parameter.GetAttributes())
{
Expand Down
4 changes: 2 additions & 2 deletions Gu.Roslyn.AnalyzerExtensions/SyntaxTree/ArgumentListSyntaxExt.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static bool TryFind(this ArgumentListSyntax argumentList, IParameterSymbo

switch (argumentList)
{
case { Arguments: { Count: 0 } }:
case { Arguments.Count: 0 }:
argument = null;
return false;
case { Arguments: { } arguments }:
Expand Down Expand Up @@ -166,7 +166,7 @@ public static bool TryFindByNameColon(this ArgumentListSyntax argumentList, stri

foreach (var candidate in argumentList.Arguments)
{
if (candidate.NameColon is { Name: { Identifier: { ValueText: { } valueText } } } &&
if (candidate.NameColon is { Name.Identifier.ValueText: { } valueText } &&
valueText == name)
{
argument = candidate;
Expand Down
6 changes: 3 additions & 3 deletions Gu.Roslyn.AnalyzerExtensions/SyntaxTree/AttributeSyntaxExt.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static bool TrySingleArgument(this AttributeSyntax attribute, [NotNullWhe
}

argument = null;
return attribute is { ArgumentList: { Arguments: { Count: 1 } arguments } } &&
return attribute is { ArgumentList.Arguments: { Count: 1 } arguments } &&
arguments.TrySingle(out argument);
}

Expand All @@ -47,9 +47,9 @@ public static bool TryFindArgument(this AttributeSyntax attribute, int index, st
{
switch (candidate)
{
case { NameColon: { Name: { Identifier: { } nameColon } } }
case { NameColon.Name.Identifier: { } nameColon }
when nameColon.ValueText == name:
case { NameEquals: { Name: { Identifier: { } nameEquals } } }
case { NameEquals.Name.Identifier: { } nameEquals }
when nameEquals.ValueText == name:
argument = candidate;
return true;
Expand Down
2 changes: 1 addition & 1 deletion Gu.Roslyn.AnalyzerExtensions/SyntaxTree/BaseMethodDeclarationSyntaxExt.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static bool TryFindParameter(this BaseMethodDeclarationSyntax method, Arg

if (method.ParameterList is { Parameters: { } parameters })
{
if (argument.NameColon is { Name: { Identifier: { } name } })
if (argument.NameColon is { Name.Identifier: { } name })
{
foreach (var candidate in parameters)
{
Expand Down
2 changes: 1 addition & 1 deletion Gu.Roslyn.AnalyzerExtensions/SyntaxTree/BasePropertyDeclarationSyntaxExt.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public static bool IsGetOnly(this BasePropertyDeclarationSyntax property)
throw new System.ArgumentNullException(nameof(property));
}

return property is { AccessorList: { Accessors: { Count: 1 } accessors } } &&
return property is { AccessorList.Accessors: { Count: 1 } accessors } &&
accessors[0] is { Body: null, ExpressionBody: null } accessor &&
accessor.IsKind(SyntaxKind.GetAccessorDeclaration);
}
Expand Down
2 changes: 1 addition & 1 deletion Gu.Roslyn.AnalyzerExtensions/SyntaxTree/BlockSyntaxExt.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static bool ContainsGoto(this BlockSyntax block)
{
case IfStatementSyntax { Statement: BlockSyntax whenTrue } when ContainsGoto(whenTrue):
return true;
case IfStatementSyntax { Else: { Statement: BlockSyntax elseBlock } } when ContainsGoto(elseBlock):
case IfStatementSyntax { Else.Statement: BlockSyntax elseBlock } when ContainsGoto(elseBlock):
return true;
}
}
Expand Down
Loading

0 comments on commit 7245172

Please sign in to comment.