Skip to content

Remove duplicate IsTypeReachableFromGeneratedCode in TestClassModelBuilder #9473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Evangelink merged 2 commits into from
Jun 28, 2026
Merged

Remove duplicate IsTypeReachableFromGeneratedCode in TestClassModelBuilder #9473

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d0202
Initial plan
Copilot Jun 27, 2026
d490141
Apply remaining changes
Copilot Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions src/Analyzers/MSTest.AotReflection.SourceGeneration/Generators/TestClassModelBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static TestClassModel Build(INamedTypeSymbol typeSymbol, List<DiagnosticI
// its members (e.g. base-declared [ClassInitialize]/[TestContext]) via [DynamicDependency]
// under trimming / Native AOT. Members are folded into the leaf model, but the trimmer
// only keeps members of the concrete type unless the base is rooted explicitly too.
if (!isLeaf && !current.IsGenericType && IsTypeReachableFromGeneratedCode(current))
if (!isLeaf && !current.IsGenericType && SymbolAccessibilityHelper.IsAccessibleFromGeneratedCode(current))
{
baseTypes.Add(current.ToDisplayString(FullyQualifiedFormat));
}
Expand Down Expand Up @@ -133,29 +133,6 @@ when IsAccessibleFromConsumer(method):
BaseTypeFullyQualifiedNames: new EquatableArray<string>(baseTypes.ToImmutable()));
}

// The generated registration lives in the same assembly as the test class, so a type is
// reachable when it (and every enclosing type) is at least internal and not file-local.
private static bool IsTypeReachableFromGeneratedCode(INamedTypeSymbol type)
{
for (INamedTypeSymbol? current = type; current is not null; current = current.ContainingType)
{
if (current.IsFileLocal)
{
return false;
}

switch (current.DeclaredAccessibility)
{
case Accessibility.Private:
case Accessibility.Protected:
case Accessibility.ProtectedAndInternal:
return false;
}
}

return true;
}

private static bool IsTestMethodAttributePresent(IMethodSymbol method)
{
foreach (AttributeData attribute in method.GetAttributes())
Expand Down
Loading