Skip to content

Commit 17f997f

Browse files
committed
Wrap expressions for improved readability
1 parent 90250f7 commit 17f997f

8 files changed

Lines changed: 22 additions & 10 deletions

File tree

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/DocumentationRules/SA1617CodeFixProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen
8383
List<SyntaxNode> nodesToFix = new List<SyntaxNode>();
8484
nodesToFix.Add(returnsElement);
8585

86-
if (previous is XmlTextSyntax previousAsTextSyntax && XmlCommentHelper.IsConsideredEmpty(previousAsTextSyntax))
86+
if (previous is XmlTextSyntax previousAsTextSyntax
87+
&& XmlCommentHelper.IsConsideredEmpty(previousAsTextSyntax))
8788
{
8889
nodesToFix.Add(previous);
8990
}

StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/SA1615ElementReturnValueMustBeDocumented.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ private static void HandleDeclaration(SyntaxNodeAnalysisContext context, bool ne
8484
return;
8585
}
8686

87-
if (returnType is PredefinedTypeSyntax predefinedType && predefinedType.Keyword.IsKind(SyntaxKind.VoidKeyword))
87+
if (returnType is PredefinedTypeSyntax predefinedType
88+
&& predefinedType.Keyword.IsKind(SyntaxKind.VoidKeyword))
8889
{
8990
// There is no return value
9091
return;

StyleCop.Analyzers/StyleCop.Analyzers/DocumentationRules/StandardTextDiagnosticBase.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ protected static MatchResult HandleDeclaration(SyntaxNodeAnalysisContext context
9595
var summaryNodes = summaryElement.Nodes().ToList();
9696
if (summaryNodes.Count >= 3)
9797
{
98-
if (summaryNodes[0] is XText firstTextPartNode && summaryNodes[1] is XElement classReferencePart && summaryNodes[2] is XText secondTextPartNode)
98+
if (summaryNodes[0] is XText firstTextPartNode
99+
&& summaryNodes[1] is XElement classReferencePart
100+
&& summaryNodes[2] is XText secondTextPartNode)
99101
{
100102
if (TextPartsMatch(firstTextPart, secondTextPart, firstTextPartNode, secondTextPartNode))
101103
{
@@ -122,7 +124,9 @@ protected static MatchResult HandleDeclaration(SyntaxNodeAnalysisContext context
122124
if (summaryElement.Content.Count >= 3)
123125
{
124126
// Standard text has the form <part1><see><part2>
125-
if (summaryElement.Content[0] is XmlTextSyntax firstTextPartSyntax && summaryElement.Content[1] is XmlEmptyElementSyntax classReferencePart && summaryElement.Content[2] is XmlTextSyntax secondTextPartSyntax)
127+
if (summaryElement.Content[0] is XmlTextSyntax firstTextPartSyntax
128+
&& summaryElement.Content[1] is XmlEmptyElementSyntax classReferencePart
129+
&& summaryElement.Content[2] is XmlTextSyntax secondTextPartSyntax)
126130
{
127131
if (TextPartsMatch(firstTextPart, secondTextPart, firstTextPartSyntax, secondTextPartSyntax))
128132
{

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/UsingDirectiveSyntaxHelpers.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ internal static bool StartsWithAlias(this UsingDirectiveSyntax usingDirective, S
104104
{
105105
foreach (var identifier in usingDirective.DescendantNodes())
106106
{
107-
if (identifier is IdentifierNameSyntax identifierName && ExcludeGlobalKeyword(identifierName))
107+
if (identifier is IdentifierNameSyntax identifierName
108+
&& ExcludeGlobalKeyword(identifierName))
108109
{
109110
return identifierName.Identifier;
110111
}

StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1518UseLineEndingsCorrectlyAtEndOfFile.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context, StyleCop
121121

122122
if (precedingTrivia.IsDirective)
123123
{
124-
if (precedingTrivia.GetStructure() is DirectiveTriviaSyntax directiveTriviaSyntax && directiveTriviaSyntax.EndOfDirectiveToken.HasTrailingTrivia)
124+
if (precedingTrivia.GetStructure() is DirectiveTriviaSyntax directiveTriviaSyntax
125+
&& directiveTriviaSyntax.EndOfDirectiveToken.HasTrailingTrivia)
125126
{
126127
var trailingWhitespaceIndex = TriviaHelper.IndexOfTrailingWhitespace(directiveTriviaSyntax.EndOfDirectiveToken.TrailingTrivia);
127128
if (trailingWhitespaceIndex >= 0)

StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1119StatementMustNotUseUnnecessaryParenthesis.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ private static void HandleParenthesizedExpression(SyntaxNodeAnalysisContext cont
153153
}
154154
else
155155
{
156-
if (node.Parent is EqualsValueClauseSyntax equalsValue && equalsValue.Value == node)
156+
if (node.Parent is EqualsValueClauseSyntax equalsValue
157+
&& equalsValue.Value == node)
157158
{
158159
ReportDiagnostic(context, node);
159160
}

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1101PrefixLocalCallsWithThis.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ private static void HandleIdentifierNameImpl(SyntaxNodeAnalysisContext context,
177177
return;
178178
}
179179

180-
if (symbol is IMethodSymbol methodSymbol && methodSymbol.MethodKind == MethodKind.Constructor)
180+
if (symbol is IMethodSymbol methodSymbol
181+
&& methodSymbol.MethodKind == MethodKind.Constructor)
181182
{
182183
return;
183184
}

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1122UseStringEmptyForEmptyStrings.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,14 @@ private static bool HasToBeConstant(LiteralExpressionSyntax literalExpression)
100100
return false;
101101
}
102102

103-
if (variableDeclarationSyntax.Parent is FieldDeclarationSyntax fieldDeclarationSyntax && fieldDeclarationSyntax.Modifiers.Any(SyntaxKind.ConstKeyword))
103+
if (variableDeclarationSyntax.Parent is FieldDeclarationSyntax fieldDeclarationSyntax
104+
&& fieldDeclarationSyntax.Modifiers.Any(SyntaxKind.ConstKeyword))
104105
{
105106
return true;
106107
}
107108

108-
if (variableDeclarationSyntax.Parent is LocalDeclarationStatementSyntax localDeclarationStatementSyntax && localDeclarationStatementSyntax.Modifiers.Any(SyntaxKind.ConstKeyword))
109+
if (variableDeclarationSyntax.Parent is LocalDeclarationStatementSyntax localDeclarationStatementSyntax
110+
&& localDeclarationStatementSyntax.Modifiers.Any(SyntaxKind.ConstKeyword))
109111
{
110112
return true;
111113
}

0 commit comments

Comments
 (0)