Skip to content
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

Fix generator crash in classes with parameterized constructor #375

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix generator crash in classes with parameterized constructor #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions src/MemoryPack.Generator/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,4 +291,22 @@ public static bool ContainsConstructorParameter(this IEnumerable<MemberMeta> mem
members.Any(x =>
x.IsConstructorParameter &&
string.Equals(constructorParameter.Name, x.ConstructorParameterName, StringComparison.OrdinalIgnoreCase));

public static bool TryGetConstructorMember(this IEnumerable<MemberMeta> members, IParameterSymbol constructorParameter, out MemberMeta? member)
{
member = members.FirstOrDefault(m =>
{
if (EqualsConstructorParameter(constructorParameter, m.Name)) return true;
if (m.Name.StartsWith(UnderScorePrefix))
{
return EqualsConstructorParameter(constructorParameter, m.Name.Substring(UnderScorePrefix.Length));
}

return false;
});

return member != null;

static bool EqualsConstructorParameter(IParameterSymbol constructorParameter, string name) => constructorParameter.Name.Equals(name, StringComparison.OrdinalIgnoreCase);
}
}
32 changes: 17 additions & 15 deletions src/MemoryPack.Generator/MemoryPackGenerator.Parser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,21 @@ public TypeMeta(INamedTypeSymbol symbol, ReferenceSymbols reference)
}
return true;
})
.Select((x, i) => new MemberMeta(x, Constructor, reference, i))
.Select((x, i) => new MemberMeta(x, reference, i))
.OrderBy(x => x.Order)
.ToArray();
.ToArray();

if (this.Constructor != null)
{
foreach (var parameter in this.Constructor.Parameters)
{
if (this.Members.TryGetConstructorMember(parameter, out var member))
{
member!.IsConstructorParameter = true;
member!.ConstructorParameterName = parameter.Name;
}
}
}

this.IsValueType = symbol.IsValueType;
this.IsUnmanagedType = symbol.IsUnmanagedType;
Expand Down Expand Up @@ -621,8 +633,8 @@ partial class MemberMeta
public bool IsProperty { get; }
public bool IsSettable { get; }
public bool IsAssignable { get; }
public bool IsConstructorParameter { get; }
public string? ConstructorParameterName { get; }
public bool IsConstructorParameter { get; set; }
public string? ConstructorParameterName { get; set; }
public int Order { get; }
public bool HasExplicitOrder { get; }
public MemberKind Kind { get; }
Expand All @@ -637,7 +649,7 @@ partial class MemberMeta
this.Kind = MemberKind.Blank;
}

public MemberMeta(ISymbol symbol, IMethodSymbol? constructor, ReferenceSymbols references, int sequentialOrder)
public MemberMeta(ISymbol symbol, ReferenceSymbols references, int sequentialOrder)
{
this.Symbol = symbol;
this.Name = symbol.Name;
Expand All @@ -655,16 +667,6 @@ public MemberMeta(ISymbol symbol, IMethodSymbol? constructor, ReferenceSymbols r
this.HasExplicitOrder = false;
}

if (constructor != null)
{
this.IsConstructorParameter = constructor.TryGetConstructorParameter(symbol, out var constructorParameter);
this.ConstructorParameterName = constructorParameter?.Name;
}
else
{
this.IsConstructorParameter = false;
}

if (symbol is IFieldSymbol f)
{
IsProperty = false;
Expand Down