Skip to content

Commit

Permalink
Apply code fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@josefpihrt
josefpihrt committed Mar 25, 2022
1 parent f76e31e commit ecbcf34
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/Analyzers.CodeFixes/CSharp/CodeFixes/LocalDeclarationStatementCodeFixProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private static ExpressionSyntax GetExpressionToInline(LocalDeclarationStatementS
expression = expression.Parenthesize();

ExpressionSyntax typeExpression = (variableDeclaration.Type.IsVar)
? variableDeclaration.Variables.First().Initializer.Value
? variableDeclaration.Variables[0].Initializer.Value
: variableDeclaration.Type;

ITypeSymbol typeSymbol = semanticModel.GetTypeSymbol(typeExpression, cancellationToken);
Expand Down
2 changes: 1 addition & 1 deletion src/Analyzers.CodeFixes/CSharp/CodeFixes/OptimizeMethodCallCodeFixProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ private static Task<Document> CallAddRangeInsteadOfAddAsync(
InvocationExpressionSyntax newInvocation = SyntaxRefactorings.ChangeInvokedMethodName(invocation, "AddRange");

newInvocation = newInvocation.ReplaceNode(
newInvocation.ArgumentList.Arguments.First().Expression,
newInvocation.ArgumentList.Arguments[0].Expression,
forEachStatement.Expression);

SyntaxNode newExpressionStatement = invocation.Parent.ReplaceNode(invocation, newInvocation)
Expand Down
4 changes: 2 additions & 2 deletions ...nalyzers.CodeFixes/CSharp/CodeFixes/UseImplicitOrExplicitObjectCreationCodeFixProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
SyntaxToken newKeyword = implicitObjectCreation.NewKeyword;
if (newKeyword.TrailingTrivia.Count == 0)
if (!newKeyword.TrailingTrivia.Any())
newKeyword = newKeyword.WithTrailingTrivia(ElasticSpace);
ObjectCreationExpressionSyntax objectCreation = ObjectCreationExpression(
Expand All @@ -111,7 +111,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
SyntaxToken newKeyword = implicitObjectCreation.NewKeyword;
if (newKeyword.TrailingTrivia.Count == 0)
if (!newKeyword.TrailingTrivia.Any())
newKeyword = newKeyword.WithTrailingTrivia(ElasticSpace);
ObjectCreationExpressionSyntax objectCreation = ObjectCreationExpression(
Expand Down
2 changes: 1 addition & 1 deletion src/Analyzers/CSharp/Analysis/NormalizeFormatOfEnumFlagValueAnalyzer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private void AnalyzeEnumDeclaration(SyntaxNodeAnalysisContext context)
{
var enumDeclaration = (EnumDeclarationSyntax)context.Node;

if (enumDeclaration.AttributeLists.Count == 0)
if (!enumDeclaration.AttributeLists.Any())
return;

EnumFlagValueStyle style = context.GetEnumFlagValueStyle();
Expand Down
2 changes: 1 addition & 1 deletion src/Analyzers/CSharp/Analysis/OptimizeMethodCallAnalysis.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ public static void OptimizeAdd(SyntaxNodeAnalysisContext context, in SimpleMembe
}

if (forEachStatement != null
&& invocation.ArgumentList.Arguments.First().Expression is IdentifierNameSyntax identifierName
&& invocation.ArgumentList.Arguments[0].Expression is IdentifierNameSyntax identifierName
&& identifierName.Identifier.ValueText == forEachStatement.Identifier.ValueText)
{
ITypeSymbol typeSymbol = context.SemanticModel.GetTypeSymbol(invocationInfo.Expression, context.CancellationToken);
Expand Down
2 changes: 1 addition & 1 deletion src/CSharp/CSharp/Extensions/SyntaxExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4040,7 +4040,7 @@ public static bool IsEmptyOrWhitespace(this SyntaxTriviaList triviaList)

internal static bool IsEmptyOrSingleWhitespaceTrivia(this SyntaxTriviaList triviaList)
{
return triviaList.Count == 0
return !triviaList.Any()
|| (triviaList.Count == 1 && triviaList[0].IsWhitespaceTrivia());
}

Expand Down
2 changes: 1 addition & 1 deletion src/Formatting.Analyzers.CodeFixes/CSharp/CompilationUnitCodeFixProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
SyntaxTriviaList leading = token.LeadingTrivia;

string title;
if (leading.First().IsWhitespaceTrivia()
if (leading[0].IsWhitespaceTrivia()
&& (leading.Count == 1
|| leading[1].IsEndOfLineTrivia()))
{
Expand Down
28 changes: 14 additions & 14 deletions src/Formatting.Analyzers/CSharp/PutAttributeListOnItsOwnLineAnalyzer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private void AnalyzeClassDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = classDeclaration.Modifiers;

SyntaxToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: classDeclaration.Keyword;

Analyze(context, classDeclaration.AttributeLists, token);
Expand All @@ -69,7 +69,7 @@ private void AnalyzeEnumDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = enumDeclaration.Modifiers;

SyntaxToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: enumDeclaration.EnumKeyword;

Analyze(context, enumDeclaration.AttributeLists, token);
Expand All @@ -90,7 +90,7 @@ private void AnalyzeInterfaceDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = interfaceDeclaration.Modifiers;

SyntaxToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: interfaceDeclaration.Keyword;

Analyze(context, interfaceDeclaration.AttributeLists, token);
Expand All @@ -103,7 +103,7 @@ private void AnalyzeStructDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = structDeclaration.Modifiers;

SyntaxToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: structDeclaration.Keyword;

Analyze(context, structDeclaration.AttributeLists, token);
Expand All @@ -116,7 +116,7 @@ private void AnalyzeRecordDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = recordDeclaration.Modifiers;

SyntaxToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: recordDeclaration.Keyword;

Analyze(context, recordDeclaration.AttributeLists, token);
Expand Down Expand Up @@ -155,7 +155,7 @@ private static void AnalyzeFieldDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = fieldDeclaration.Modifiers;

SyntaxNodeOrToken nodeOrToken = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: fieldDeclaration.Declaration.Type;

Analyze(context, fieldDeclaration.AttributeLists, nodeOrToken);
Expand All @@ -168,7 +168,7 @@ private void AnalyzeMethodDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = methodDeclaration.Modifiers;

SyntaxNodeOrToken nodeOrToken = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: methodDeclaration.ReturnType;

Analyze(context, methodDeclaration.AttributeLists, nodeOrToken);
Expand All @@ -181,7 +181,7 @@ private void AnalyzeConstructorDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = constructorDeclaration.Modifiers;

SyntaxToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: constructorDeclaration.Identifier;

Analyze(context, constructorDeclaration.AttributeLists, token);
Expand All @@ -194,7 +194,7 @@ private void AnalyzeConversionOperatorDeclaration(SyntaxNodeAnalysisContext cont
SyntaxTokenList modifiers = conversionOperatorDeclaration.Modifiers;

SyntaxToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: conversionOperatorDeclaration.ImplicitOrExplicitKeyword;

Analyze(context, conversionOperatorDeclaration.AttributeLists, token);
Expand All @@ -207,7 +207,7 @@ private void AnalyzeDestructorDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = destructorDeclaration.Modifiers;

SyntaxToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: destructorDeclaration.TildeToken;

Analyze(context, destructorDeclaration.AttributeLists, token);
Expand All @@ -220,7 +220,7 @@ private void AnalyzeEventDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = eventDeclaration.Modifiers;

SyntaxToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: eventDeclaration.EventKeyword;

Analyze(context, eventDeclaration.AttributeLists, token);
Expand All @@ -236,7 +236,7 @@ private void AnalyzeOperatorDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = operatorDeclaration.Modifiers;

SyntaxNodeOrToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: operatorDeclaration.ReturnType;

Analyze(context, operatorDeclaration.AttributeLists, token);
Expand All @@ -249,7 +249,7 @@ private void AnalyzePropertyDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = propertyDeclaration.Modifiers;

SyntaxNodeOrToken token = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: propertyDeclaration.Type;

Analyze(context, propertyDeclaration.AttributeLists, token);
Expand All @@ -265,7 +265,7 @@ private void AnalyzeIndexerDeclaration(SyntaxNodeAnalysisContext context)
SyntaxTokenList modifiers = indexerDeclaration.Modifiers;

SyntaxNodeOrToken nodeOrToken = (modifiers.Any())
? modifiers.First()
? modifiers[0]
: indexerDeclaration.Type;

Analyze(context, indexerDeclaration.AttributeLists, nodeOrToken);
Expand Down
2 changes: 1 addition & 1 deletion src/Refactorings/CSharp/Refactorings/ExpandPositionalConstructorRefactoring.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private static Task<Document> RefactorAsync(
newParameterList.Parameters.Select(parameter => parameter.Identifier),
(identifier, _) => identifiersMap[identifier.ValueText]);

ParameterSyntax firstParameter = parameterList.Parameters.First();
ParameterSyntax firstParameter = parameterList.Parameters[0];
if (firstParameter.GetLeadingTrivia().SingleOrDefault(shouldThrow: false).IsKind(SyntaxKind.WhitespaceTrivia))
{
SyntaxTriviaList newIndentation = SyntaxTriviaAnalysis.GetIncreasedIndentationTriviaList(firstParameter, cancellationToken);
Expand Down
2 changes: 1 addition & 1 deletion src/Refactorings/CSharp/Refactorings/InsertInterpolationRefactoring.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static bool CanRefactor(RefactoringContext context, InterpolatedStringExp
int i = 0;
SyntaxList<InterpolatedStringContentSyntax> contents = interpolatedString.Contents;

if (contents.Count == 0)
if (!contents.Any())
{
return span.Start == interpolatedString.StringStartToken.Span.End
&& span.End == interpolatedString.StringEndToken.SpanStart;
Expand Down
4 changes: 2 additions & 2 deletions src/Tools/CodeGeneration/CSharp/WrapRewriter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public override SyntaxNode VisitClassDeclaration(ClassDeclarationSyntax node)
{
_maxFieldDeclarationLength = fields
.Cast<FieldDeclarationSyntax>()
.Max(f => f.Declaration.Variables.First().Initializer.EqualsToken.SpanStart - f.SpanStart);
.Max(f => f.Declaration.Variables[0].Initializer.EqualsToken.SpanStart - f.SpanStart);
}

_classDeclarationDepth++;
Expand All @@ -49,7 +49,7 @@ public override SyntaxNode VisitFieldDeclaration(FieldDeclarationSyntax node)

if ((Options & WrapRewriterOptions.IndentFieldInitializer) != 0)
{
SyntaxToken equalsToken = node.Declaration.Variables.First().Initializer.EqualsToken;
SyntaxToken equalsToken = node.Declaration.Variables[0].Initializer.EqualsToken;

int count = _maxFieldDeclarationLength - (equalsToken.SpanStart - node.SpanStart);

Expand Down

0 comments on commit ecbcf34

Please sign in to comment.