Skip to content

Commit 9027f93

Browse files
sharwellsharwell
committed
Remove unnecessary type checks
1 parent 50eb92d commit 9027f93

10 files changed

Lines changed: 46 additions & 70 deletions

‎StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1501StatementMustNotBeOnASingleLine.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ private static void HandleCompilationStart(CompilationStartAnalysisContext conte
9191

9292
private static void HandleBlock(SyntaxNodeAnalysisContext context)
9393
{
94-
var block = context.Node as BlockSyntax;
95-
if ((block != null) &&
96-
!block.OpenBraceToken.IsMissing &&
94+
var block = (BlockSyntax)context.Node;
95+
if (!block.OpenBraceToken.IsMissing &&
9796
!block.CloseBraceToken.IsMissing &&
9897
IsPartOfStatement(block))
9998
{

‎StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1516ElementsMustBeSeparatedByBlankLine.cs‎

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -158,61 +158,52 @@ private static void HandleBasePropertyDeclaration(SyntaxNodeAnalysisContext cont
158158

159159
private static void HandleTypeDeclaration(SyntaxNodeAnalysisContext context)
160160
{
161-
var typeDeclaration = context.Node as TypeDeclarationSyntax;
161+
var typeDeclaration = (TypeDeclarationSyntax)context.Node;
162162

163-
if (typeDeclaration != null)
164-
{
165-
var members = typeDeclaration.Members;
163+
var members = typeDeclaration.Members;
166164

167-
HandleMemberList(context, members);
168-
}
165+
HandleMemberList(context, members);
169166
}
170167

171168
private static void HandleCompilationUnit(SyntaxNodeAnalysisContext context, StyleCopSettings settings)
172169
{
173-
var compilationUnit = context.Node as CompilationUnitSyntax;
170+
var compilationUnit = (CompilationUnitSyntax)context.Node;
174171

175-
if (compilationUnit != null)
176-
{
177-
var usings = compilationUnit.Usings;
178-
var members = compilationUnit.Members;
172+
var usings = compilationUnit.Usings;
173+
var members = compilationUnit.Members;
179174

180-
HandleUsings(context, usings, settings);
181-
HandleMemberList(context, members);
175+
HandleUsings(context, usings, settings);
176+
HandleMemberList(context, members);
182177

183-
if (members.Count > 0 && compilationUnit.Usings.Count > 0)
184-
{
185-
ReportIfThereIsNoBlankLine(context, usings[usings.Count - 1], members[0]);
186-
}
178+
if (members.Count > 0 && compilationUnit.Usings.Count > 0)
179+
{
180+
ReportIfThereIsNoBlankLine(context, usings[usings.Count - 1], members[0]);
181+
}
187182

188-
if (compilationUnit.Usings.Count > 0 && compilationUnit.Externs.Count > 0)
189-
{
190-
ReportIfThereIsNoBlankLine(context, compilationUnit.Externs[compilationUnit.Externs.Count - 1], compilationUnit.Usings[0]);
191-
}
183+
if (compilationUnit.Usings.Count > 0 && compilationUnit.Externs.Count > 0)
184+
{
185+
ReportIfThereIsNoBlankLine(context, compilationUnit.Externs[compilationUnit.Externs.Count - 1], compilationUnit.Usings[0]);
192186
}
193187
}
194188

195189
private static void HandleNamespaceDeclaration(SyntaxNodeAnalysisContext context, StyleCopSettings settings)
196190
{
197-
var namespaceDeclaration = context.Node as NamespaceDeclarationSyntax;
191+
var namespaceDeclaration = (NamespaceDeclarationSyntax)context.Node;
198192

199-
if (namespaceDeclaration != null)
200-
{
201-
var usings = namespaceDeclaration.Usings;
202-
var members = namespaceDeclaration.Members;
193+
var usings = namespaceDeclaration.Usings;
194+
var members = namespaceDeclaration.Members;
203195

204-
HandleUsings(context, usings, settings);
205-
HandleMemberList(context, members);
196+
HandleUsings(context, usings, settings);
197+
HandleMemberList(context, members);
206198

207-
if (members.Count > 0 && namespaceDeclaration.Usings.Count > 0)
208-
{
209-
ReportIfThereIsNoBlankLine(context, usings[usings.Count - 1], members[0]);
210-
}
199+
if (members.Count > 0 && namespaceDeclaration.Usings.Count > 0)
200+
{
201+
ReportIfThereIsNoBlankLine(context, usings[usings.Count - 1], members[0]);
202+
}
211203

212-
if (namespaceDeclaration.Usings.Count > 0 && namespaceDeclaration.Externs.Count > 0)
213-
{
214-
ReportIfThereIsNoBlankLine(context, namespaceDeclaration.Externs[namespaceDeclaration.Externs.Count - 1], namespaceDeclaration.Usings[0]);
215-
}
204+
if (namespaceDeclaration.Usings.Count > 0 && namespaceDeclaration.Externs.Count > 0)
205+
{
206+
ReportIfThereIsNoBlankLine(context, namespaceDeclaration.Externs[namespaceDeclaration.Externs.Count - 1], namespaceDeclaration.Usings[0]);
216207
}
217208
}
218209

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ private static void HandleCompilationStart(CompilationStartAnalysisContext conte
9696

9797
private static void HandleParenthesizedExpression(SyntaxNodeAnalysisContext context)
9898
{
99-
var node = context.Node as ParenthesizedExpressionSyntax;
99+
var node = (ParenthesizedExpressionSyntax)context.Node;
100100

101-
if (node != null && node.Expression != null)
101+
if (node.Expression != null)
102102
{
103103
if (!(node.Expression is BinaryExpressionSyntax)
104104
&& !(node.Expression is AssignmentExpressionSyntax)

‎StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1410RemoveDelegateParenthesisWhenPossible.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,7 @@ public override void Initialize(AnalysisContext context)
6363

6464
private static void HandleAnonymousMethodExpression(SyntaxNodeAnalysisContext context)
6565
{
66-
AnonymousMethodExpressionSyntax syntax = context.Node as AnonymousMethodExpressionSyntax;
67-
if (syntax == null)
68-
{
69-
return;
70-
}
66+
var syntax = (AnonymousMethodExpressionSyntax)context.Node;
7167

7268
// ignore if no parameter list exists
7369
if (syntax.ParameterList == null)

‎StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SystemDiagnosticsDebugDiagnosticBase.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ internal abstract class SystemDiagnosticsDebugDiagnosticBase : DiagnosticAnalyze
2424
/// <param name="descriptor">The descriptor of the diagnostic that should be added</param>
2525
protected internal static void HandleMethodCall(SyntaxNodeAnalysisContext context, string methodName, int parameterIndex, DiagnosticDescriptor descriptor)
2626
{
27-
var invocationExpressionSyntax = context.Node as InvocationExpressionSyntax;
28-
var memberAccessExpressionSyntax = invocationExpressionSyntax?.Expression as MemberAccessExpressionSyntax;
29-
var identifierNameSyntax = invocationExpressionSyntax?.Expression as IdentifierNameSyntax;
27+
var invocationExpressionSyntax = (InvocationExpressionSyntax)context.Node;
28+
var memberAccessExpressionSyntax = invocationExpressionSyntax.Expression as MemberAccessExpressionSyntax;
29+
var identifierNameSyntax = invocationExpressionSyntax.Expression as IdentifierNameSyntax;
3030
var name = memberAccessExpressionSyntax?.Name?.Identifier.ValueText ?? identifierNameSyntax?.Identifier.ValueText;
3131
if (name == methodName)
3232
{

‎StyleCop.Analyzers/StyleCop.Analyzers/NamingRules/SA1311StaticReadonlyFieldsMustBeginWithUpperCaseLetter.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ public override void Initialize(AnalysisContext context)
5050

5151
private static void HandleFieldDeclaration(SyntaxNodeAnalysisContext context)
5252
{
53-
var fieldDeclaration = context.Node as FieldDeclarationSyntax;
54-
if (fieldDeclaration == null)
55-
{
56-
return;
57-
}
53+
var fieldDeclaration = (FieldDeclarationSyntax)context.Node;
5854

5955
if (!fieldDeclaration.Modifiers.Any(SyntaxKind.StaticKeyword) ||
6056
!fieldDeclaration.Modifiers.Any(SyntaxKind.ReadOnlyKeyword))

‎StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1208SystemUsingDirectivesMustBePlacedBeforeOtherUsingDirectives.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private static void HandleCompilationUnit(SyntaxNodeAnalysisContext context, Sty
6262
return;
6363
}
6464

65-
var compilationUnit = context.Node as CompilationUnitSyntax;
65+
var compilationUnit = (CompilationUnitSyntax)context.Node;
6666

6767
var usings = compilationUnit.Usings;
6868

@@ -76,7 +76,7 @@ private static void HandleNamespaceDeclaration(SyntaxNodeAnalysisContext context
7676
return;
7777
}
7878

79-
var namespaceDeclaration = context.Node as NamespaceDeclarationSyntax;
79+
var namespaceDeclaration = (NamespaceDeclarationSyntax)context.Node;
8080

8181
var usings = namespaceDeclaration.Usings;
8282

‎StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1209UsingAliasDirectivesMustBePlacedAfterOtherUsingDirectives.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ public override void Initialize(AnalysisContext context)
5555

5656
private static void HandleCompilationUnit(SyntaxNodeAnalysisContext context)
5757
{
58-
var compilationUnit = context.Node as CompilationUnitSyntax;
58+
var compilationUnit = (CompilationUnitSyntax)context.Node;
5959

6060
ProcessUsingsAndReportDiagnostic(compilationUnit.Usings, context);
6161
}
6262

6363
private static void HandleNamespaceDeclaration(SyntaxNodeAnalysisContext context)
6464
{
65-
var namespaceDeclaration = context.Node as NamespaceDeclarationSyntax;
65+
var namespaceDeclaration = (NamespaceDeclarationSyntax)context.Node;
6666

6767
ProcessUsingsAndReportDiagnostic(namespaceDeclaration.Usings, context);
6868
}

‎StyleCop.Analyzers/StyleCop.Analyzers/OrderingRules/SA1211UsingAliasDirectivesMustBeOrderedAlphabeticallyByAliasName.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,14 @@ public override void Initialize(AnalysisContext context)
5555

5656
private static void HandleCompilationUnit(SyntaxNodeAnalysisContext context)
5757
{
58-
var compilationUnit = context.Node as CompilationUnitSyntax;
59-
if (compilationUnit != null)
60-
{
61-
HandleUsingDirectives(context, compilationUnit.Usings);
62-
}
58+
var compilationUnit = (CompilationUnitSyntax)context.Node;
59+
HandleUsingDirectives(context, compilationUnit.Usings);
6360
}
6461

6562
private static void HandleNamespaceDeclaration(SyntaxNodeAnalysisContext context)
6663
{
67-
var namespaceDeclaration = context.Node as NamespaceDeclarationSyntax;
68-
if (namespaceDeclaration != null)
69-
{
70-
HandleUsingDirectives(context, namespaceDeclaration.Usings);
71-
}
64+
var namespaceDeclaration = (NamespaceDeclarationSyntax)context.Node;
65+
HandleUsingDirectives(context, namespaceDeclaration.Usings);
7266
}
7367

7468
private static void HandleUsingDirectives(SyntaxNodeAnalysisContext context, SyntaxList<UsingDirectiveSyntax> usingDirectives)

‎StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1107CodeMustNotContainMultipleStatementsOnOneLine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public override void Initialize(AnalysisContext context)
5151

5252
private static void HandleBlock(SyntaxNodeAnalysisContext context)
5353
{
54-
BlockSyntax block = context.Node as BlockSyntax;
54+
var block = (BlockSyntax)context.Node;
5555

56-
if (block != null && block.Statements.Any())
56+
if (block.Statements.Any())
5757
{
5858
var previousStatement = block.Statements[0];
5959
FileLinePositionSpan previousStatementLocation = previousStatement.GetLineSpan();

0 commit comments

Comments
 (0)