Skip to content

Address review feedback: fully-qualified types, member ordering, and diagnostic improvements #110

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
JerrettDavis merged 2 commits into from
Feb 10, 2026
Merged

Address review feedback: fully-qualified types, member ordering, and diagnostic improvements #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ca747
Initial plan
Copilot Feb 10, 2026
7de3b31
fix(adapter): address review feedback - fully-qualified types, member…
Copilot Feb 10, 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
2 changes: 1 addition & 1 deletion src/PatternKit.Generators.Abstractions/Adapter/AdapterAttributes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public sealed class GenerateAdapterAttribute : Attribute
/// <list type="bullet">
/// <item><description>First parameter must be the adaptee type</description></item>
/// <item><description>Remaining parameters must match the target member's parameters</description></item>
/// <item><description>Return type must be compatible with the target member's return type</description></item>
/// <item><description>Return type must match the target member's return type exactly</description></item>
/// </list>
/// </remarks>
/// <example>
Expand Down
47 changes: 21 additions & 26 deletions src/PatternKit.Generators/Adapter/AdapterGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public sealed class AdapterGenerator : IIncrementalGenerator
private const string DiagIdDuplicateMapping = "PKADP004";
private const string DiagIdSignatureMismatch = "PKADP005";
private const string DiagIdTypeNameConflict = "PKADP006";
private const string DiagIdInvalidAdapteType = "PKADP007";
private const string DiagIdInvalidAdapteeType = "PKADP007";
private const string DiagIdMapMethodNotStatic = "PKADP008";
private const string DiagIdEventsNotSupported = "PKADP009";
private const string DiagIdGenericMethodsNotSupported = "PKADP010";
Expand Down Expand Up @@ -85,7 +85,7 @@ public sealed class AdapterGenerator : IIncrementalGenerator
isEnabledByDefault: true);

private static readonly DiagnosticDescriptor InvalidAdapteeTypeDescriptor = new(
id: DiagIdInvalidAdapteType,
id: DiagIdInvalidAdapteeType,
title: "Invalid adaptee type",
messageFormat: "Adaptee type '{0}' must be a concrete class or struct",
category: "PatternKit.Generators.Adapter",
Expand Down Expand Up @@ -398,12 +398,11 @@ private List<Diagnostic> ValidateTargetMembers(INamedTypeSymbol targetType, Loca
if (!processed.Add(type))
continue;

foreach (var member in type.GetMembers())
{
// For abstract classes, only check abstract members
if (isAbstractClass && !member.IsAbstract)
continue;
var membersToCheck = type.GetMembers()
.Where(m => !isAbstractClass || m.IsAbstract);

foreach (var member in membersToCheck)
{
// Check for events (not supported)
if (member is IEventSymbol evt)
{
Expand Down Expand Up @@ -458,16 +457,13 @@ private List<Diagnostic> ValidateTargetMembers(INamedTypeSymbol targetType, Loca

// Check for true overloaded methods (same name, different signatures)
// Diamond inheritance (same signature from multiple paths) is OK
foreach (var kvp in methodSignatures)
foreach (var kvp in methodSignatures.Where(kvp => kvp.Value.Count > 1))
{
if (kvp.Value.Count > 1)
{
diagnostics.Add(Diagnostic.Create(
OverloadedMethodsNotSupportedDescriptor,
location,
targetType.Name,
kvp.Key));
}
diagnostics.Add(Diagnostic.Create(
OverloadedMethodsNotSupportedDescriptor,
location,
targetType.Name,
kvp.Key));
}

return diagnostics;
Expand Down Expand Up @@ -560,12 +556,11 @@ private static List<ISymbol> GetTargetMembers(INamedTypeSymbol targetType)
if (!processed.Add(type))
continue;

foreach (var member in type.GetMembers())
{
// For abstract classes, only include abstract members (must be overridden)
if (isAbstractClass && !member.IsAbstract)
continue;
var membersToProcess = type.GetMembers()
.Where(m => !isAbstractClass || m.IsAbstract);

foreach (var member in membersToProcess)
{
// Include methods (not constructors), properties (not events - not supported)
if (member is IMethodSymbol method && method.MethodKind == MethodKind.Ordinary)
{
Expand All @@ -577,7 +572,7 @@ private static List<ISymbol> GetTargetMembers(INamedTypeSymbol targetType)
else if (member is IPropertySymbol prop && !prop.IsIndexer)
{
// De-duplicate by name+type for properties
var sig = $"P:{prop.Name}:{prop.Type.ToDisplayString()}";
var sig = $"P:{prop.Name}:{prop.Type.ToDisplayString(FullyQualifiedFormat)}";
if (seenSignatures.Add(sig))
members.Add(member);
}
Expand All @@ -597,15 +592,15 @@ private static List<ISymbol> GetTargetMembers(INamedTypeSymbol targetType)
}
}

// Sort by name for deterministic output
return members.OrderBy(m => m.Name).ThenBy(m => m.ToDisplayString()).ToList();
// Return in declaration order (members already added in traversal order)
return members;
}

private static string GetMemberSignature(IMethodSymbol method)
{
var paramSig = string.Join(",", method.Parameters.Select(p =>
$"{p.RefKind}:{p.Type.ToDisplayString()}"));
return $"M:{method.Name}({paramSig}):{method.ReturnType.ToDisplayString()}";
$"{p.RefKind}:{p.Type.ToDisplayString(FullyQualifiedFormat)}"));
return $"M:{method.Name}({paramSig}):{method.ReturnType.ToDisplayString(FullyQualifiedFormat)}";
}

private static string? ValidateSignature(ISymbol targetMember, IMethodSymbol mapMethod, INamedTypeSymbol adapteeType)
Expand Down