Skip to content

Commit 6194e49

Browse files
use patterns
1 parent 3918a22 commit 6194e49

File tree

12 files changed

+17
-18
lines changed

12 files changed

+17
-18
lines changed

src/Analyzers/CSharp/CodeFixes/GenerateParameterizedMember/CSharpGenerateConversionService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ internal sealed partial class CSharpGenerateConversionService() :
2828
protected override bool IsImplicitConversionGeneration(SyntaxNode node)
2929
{
3030
return node is ExpressionSyntax &&
31-
(node.Parent is AssignmentExpressionSyntax || node.Parent is EqualsValueClauseSyntax) &&
32-
!(node is CastExpressionSyntax) &&
33-
!(node is MemberAccessExpressionSyntax);
31+
node.Parent is AssignmentExpressionSyntax or EqualsValueClauseSyntax &&
32+
node is not CastExpressionSyntax &&
33+
node is not MemberAccessExpressionSyntax;
3434
}
3535

3636
protected override bool IsExplicitConversionGeneration(SyntaxNode node)

src/Features/CSharp/Portable/IntroduceUsingStatement/CSharpIntroduceUsingStatementCodeRefactoringProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected override (SyntaxList<StatementSyntax> tryStatements, SyntaxList<Statem
3939
=> (tryStatement.Block.Statements, tryStatement.Finally?.Block.Statements ?? default);
4040

4141
protected override bool CanRefactorToContainBlockStatements(SyntaxNode parent)
42-
=> parent is BlockSyntax || parent is SwitchSectionSyntax || parent.IsEmbeddedStatementOwner();
42+
=> parent is BlockSyntax or SwitchSectionSyntax || parent.IsEmbeddedStatementOwner();
4343

4444
protected override SyntaxList<StatementSyntax> GetSurroundingStatements(StatementSyntax statement)
4545
=> statement.GetRequiredParent() switch

src/Features/CSharp/Portable/SignatureHelp/ElementAccessExpressionSignatureHelpProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ internal static bool IsArgumentListToken(ElementAccessExpressionSyntax expressio
295295
internal static TextSpan GetTextSpan(SyntaxToken openBracket)
296296
{
297297
Contract.ThrowIfFalse(openBracket.Parent is BracketedArgumentListSyntax &&
298-
(openBracket.Parent.Parent is ElementAccessExpressionSyntax || openBracket.Parent.Parent is ElementBindingExpressionSyntax));
298+
openBracket.Parent.Parent is ElementAccessExpressionSyntax or ElementBindingExpressionSyntax);
299299
return SignatureHelpUtilities.GetSignatureHelpSpan((BracketedArgumentListSyntax)openBracket.Parent);
300300
}
301301

src/Features/Core/Portable/AddImport/SymbolReferenceFinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ private async Task<ImmutableArray<SymbolReference>> GetReferencesForMatchingFiel
337337
private bool HasAccessibleStaticFieldOrProperty(INamedTypeSymbol namedType, string fieldOrPropertyName)
338338
{
339339
return namedType.GetMembers(fieldOrPropertyName)
340-
.Any(static (m, self) => (m is IFieldSymbol || m is IPropertySymbol) &&
340+
.Any(static (m, self) => (m is IFieldSymbol or IPropertySymbol) &&
341341
m.IsStatic &&
342342
m.IsAccessibleWithin(self._semanticModel.Compilation.Assembly), this);
343343
}

src/LanguageServer/Protocol/Protocol/Internal/VSInternalLocation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public object? Text
3030

3131
set
3232
{
33-
if (value is ImageElement || value is ContainerElement || value is ClassifiedTextElement || value is string)
33+
if (value is ImageElement or ContainerElement or ClassifiedTextElement or string)
3434
{
3535
this.textValue = value;
3636
}
@@ -41,4 +41,4 @@ public object? Text
4141
}
4242
}
4343
}
44-
}
44+
}

src/LanguageServer/Protocol/Protocol/Internal/VSInternalReferenceItem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public object? DefinitionText
6868

6969
set
7070
{
71-
if (value == null || // Null is accepted since for non-definition references
72-
(value is ImageElement || value is ContainerElement || value is ClassifiedTextElement || value is string))
71+
// Null is accepted since for non-definition references
72+
if (value is null or ImageElement or ContainerElement or ClassifiedTextElement or string)
7373
{
7474
this.definitionTextValue = value;
7575
}

src/Test/PdbUtilities/EditAndContinue/EditAndContinueTestUtilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static EmitBaseline CreateInitialBaseline(Compilation compilation, Module
2424
{
2525
return module.Module.GetMethodBodyOrThrow(methodHandle)?.LocalSignature ?? default;
2626
}
27-
catch (Exception e) when (e is BadImageFormatException || e is IOException)
27+
catch (Exception e) when (e is BadImageFormatException or IOException)
2828
{
2929
throw new InvalidDataException(e.Message, e);
3030
}

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/Rules/IndentBlockFormattingRule.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,13 +328,13 @@ private static void AddEmbeddedStatementsIndentationOperation(List<IndentBlockOp
328328
return;
329329
}
330330

331-
if (node is UsingStatementSyntax usingStatement && usingStatement.Statement != null && !(usingStatement.Statement is BlockSyntax || usingStatement.Statement is UsingStatementSyntax))
331+
if (node is UsingStatementSyntax usingStatement && usingStatement.Statement != null && !(usingStatement.Statement is BlockSyntax or UsingStatementSyntax))
332332
{
333333
AddEmbeddedStatementsIndentationOperation(list, usingStatement.Statement);
334334
return;
335335
}
336336

337-
if (node is FixedStatementSyntax fixedStatement && fixedStatement.Statement != null && !(fixedStatement.Statement is BlockSyntax || fixedStatement.Statement is FixedStatementSyntax))
337+
if (node is FixedStatementSyntax fixedStatement && fixedStatement.Statement != null && !(fixedStatement.Statement is BlockSyntax or FixedStatementSyntax))
338338
{
339339
AddEmbeddedStatementsIndentationOperation(list, fixedStatement.Statement);
340340
return;

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/Rules/TokenBasedFormattingRule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ currentToken.Parent is (kind: SyntaxKind.NullableType or SyntaxKind.ClassConstra
527527
}
528528

529529
// ~ * case
530-
if (previousToken.Kind() == SyntaxKind.TildeToken && (previousToken.Parent is PrefixUnaryExpressionSyntax || previousToken.Parent is DestructorDeclarationSyntax))
530+
if (previousToken.Kind() == SyntaxKind.TildeToken && (previousToken.Parent is PrefixUnaryExpressionSyntax or DestructorDeclarationSyntax))
531531
{
532532
return CreateAdjustSpacesOperation(0, AdjustSpacesOption.ForceSpacesIfOnSingleLine);
533533
}

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Services/SyntaxFacts/CSharpSyntaxFacts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public bool IsOperator(SyntaxToken token)
104104

105105
return
106106
(SyntaxFacts.IsAnyUnaryExpression(kind) &&
107-
(token.Parent is PrefixUnaryExpressionSyntax || token.Parent is PostfixUnaryExpressionSyntax || token.Parent is OperatorDeclarationSyntax)) ||
107+
(token.Parent is PrefixUnaryExpressionSyntax or PostfixUnaryExpressionSyntax or OperatorDeclarationSyntax)) ||
108108
(SyntaxFacts.IsBinaryExpression(kind) && (token.Parent is BinaryExpressionSyntax or OperatorDeclarationSyntax or RelationalPatternSyntax)) ||
109109
(SyntaxFacts.IsAssignmentExpressionOperatorToken(kind) && token.Parent is AssignmentExpressionSyntax);
110110
}

0 commit comments

Comments
 (0)