Skip to content

Commit 143bbaa

Browse files
Code review update: Improved names in analyzer SA1402FileMayOnlyContainASingleType.
1 parent 6d421c2 commit 143bbaa

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

StyleCop.Analyzers/StyleCop.Analyzers/MaintainabilityRules/SA1402FileMayOnlyContainASingleType.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context, StyleCop
6161
{
6262
var syntaxRoot = context.Tree.GetRoot(context.CancellationToken);
6363

64-
var typeNodes = GetTypeDeclarations(syntaxRoot, settings);
64+
var typeNodes = GetTopLevelTypeDeclarations(syntaxRoot, settings);
6565

6666
string suffix;
6767
var fileName = FileNameHelpers.GetFileNameAndSuffix(context.Tree.FilePath, out suffix);
@@ -90,14 +90,14 @@ private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context, StyleCop
9090
}
9191
}
9292

93-
private static IEnumerable<MemberDeclarationSyntax> GetTypeDeclarations(SyntaxNode root, StyleCopSettings settings)
93+
private static IEnumerable<MemberDeclarationSyntax> GetTopLevelTypeDeclarations(SyntaxNode root, StyleCopSettings settings)
9494
{
95-
var typeDeclarations = root.DescendantNodes(descendIntoChildren: node => ContainsTypeDeclarations(node)).OfType<MemberDeclarationSyntax>().ToList();
96-
var relevantTypeDeclarations = typeDeclarations.Where(x => IsRelevantType(x, settings)).ToList();
95+
var allTypeDeclarations = root.DescendantNodes(descendIntoChildren: node => ContainsTopLevelTypeDeclarations(node)).OfType<MemberDeclarationSyntax>().ToList();
96+
var relevantTypeDeclarations = allTypeDeclarations.Where(x => IsRelevantType(x, settings)).ToList();
9797
return relevantTypeDeclarations;
9898
}
9999

100-
private static bool ContainsTypeDeclarations(SyntaxNode node)
100+
private static bool ContainsTopLevelTypeDeclarations(SyntaxNode node)
101101
{
102102
return node.IsKind(SyntaxKind.CompilationUnit) || node.IsKind(SyntaxKind.NamespaceDeclaration);
103103
}

0 commit comments

Comments
 (0)