Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Add support for Unbound Generic Types #158

Merged
merged 11 commits into from
Aug 19, 2020
Merged

Add support for Unbound Generic Types #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e8e9cc8
Use Avalonia 0.9.*
worldbeater Aug 18, 2020
c056ec6
Use Avalonia 0.9.* as inline data
worldbeater Aug 18, 2020
531823b
Update package identity tests
worldbeater Aug 18, 2020
38c3625
Remove extra file
worldbeater Aug 18, 2020
48cbd5f
Don't add global:: if the type is unbound
worldbeater Aug 18, 2020
33d9b6d
Support generic type parameters in Rx*Events classes
worldbeater Aug 19, 2020
0fc907d
Support inheritance from generic base types
worldbeater Aug 19, 2020
9201e20
Approve the new generated API
worldbeater Aug 19, 2020
8a8cf2a
Formatting fixes
worldbeater Aug 19, 2020
5eb8024
Further formatting fixes
worldbeater Aug 19, 2020
fa5f0bb
Use the GenerateName local function
worldbeater Aug 19, 2020
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
53 changes: 47 additions & 6 deletions src/Pharmacist.Core/Generation/Generators/InstanceEventGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,40 @@ private static ClassDeclarationSyntax GenerateStaticClass(string namespaceName,
.WithLeadingTrivia(XmlSyntaxFactory.GenerateSummarySeeAlsoComment("A class that contains extension methods to wrap events for classes contained within the {0} namespace.", namespaceName))
.WithMembers(List<MemberDeclarationSyntax>(declarations.Select(declaration =>
{
var eventsClassName = IdentifierName("Rx" + declaration.Name + "Events");
return MethodDeclaration(eventsClassName, Identifier("Events"))
return BuildMethodDeclaration(declaration)
.WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.StaticKeyword)))
.WithParameterList(ParameterList(SingletonSeparatedList(
Parameter(Identifier("item"))
.WithModifiers(TokenList(Token(SyntaxKind.ThisKeyword)))
.WithType(IdentifierName(declaration.GenerateFullGenericName())))))
.WithExpressionBody(ArrowExpressionClause(
ObjectCreationExpression(eventsClassName)
.WithArgumentList(ArgumentList(SingletonSeparatedList(Argument(IdentifierName("item")))))))
.WithSemicolonToken(Token(SyntaxKind.SemicolonToken))
.WithObsoleteAttribute(declaration)
.WithLeadingTrivia(XmlSyntaxFactory.GenerateSummarySeeAlsoComment("A wrapper class which wraps all the events contained within the {0} class.", declaration.ConvertToDocument()));

static MethodDeclarationSyntax BuildMethodDeclaration(ITypeDefinition declaration)
{
if (declaration.IsUnboundGenericTypeDefinition())
{
var args = string.Join(", ", declaration.TypeArguments.Select(param => param.FullName));
var genericEventsClassName = IdentifierName("Rx" + declaration.Name + "Events<" + args + ">");
return MethodDeclaration(genericEventsClassName, Identifier("Events"))
.WithTypeParameterList(TypeParameterList(
Token(SyntaxKind.LessThanToken),
SeparatedList(declaration.TypeArguments.Select(arg => TypeParameter(arg.FullName))),
Token(SyntaxKind.GreaterThanToken)))
.WithExpressionBody(ArrowExpressionClause(
ObjectCreationExpression(genericEventsClassName)
.WithArgumentList(ArgumentList(SingletonSeparatedList(
Argument(IdentifierName("item")))))));
}

var eventsClassName = IdentifierName("Rx" + declaration.Name + "Events");
return MethodDeclaration(eventsClassName, Identifier("Events"))
.WithExpressionBody(ArrowExpressionClause(
ObjectCreationExpression(eventsClassName)
.WithArgumentList(ArgumentList(SingletonSeparatedList(
Argument(IdentifierName("item")))))));
}
})));
}

Expand Down Expand Up @@ -112,9 +133,29 @@ private static ClassDeclarationSyntax GenerateEventWrapperClass(ITypeDefinition
.WithObsoleteAttribute(typeDefinition)
.WithLeadingTrivia(XmlSyntaxFactory.GenerateSummarySeeAlsoComment("A class which wraps the events contained within the {0} class as observables.", typeDefinition.ConvertToDocument()));

if (typeDefinition.IsUnboundGenericTypeDefinition())
{
classDeclaration = classDeclaration.WithTypeParameterList(TypeParameterList(
Token(SyntaxKind.LessThanToken),
SeparatedList(typeDefinition.TypeArguments.Select(arg => TypeParameter(arg.FullName))),
Token(SyntaxKind.GreaterThanToken)));
}

if (baseTypeDefinition != null)
{
classDeclaration = classDeclaration.WithBaseList(BaseList(SingletonSeparatedList<BaseTypeSyntax>(SimpleBaseType(IdentifierName($"global::{baseTypeDefinition.Namespace}.Rx{baseTypeDefinition.Name}Events")))));
var baseTypeName = $"global::{baseTypeDefinition.Namespace}.Rx{baseTypeDefinition.Name}Events";
if (baseTypeDefinition.IsUnboundGenericTypeDefinition())
{
var directBaseType = typeDefinition.DirectBaseTypes
.First(directBase => directBase.FullName == baseTypeDefinition.FullName);
var argumentList = directBaseType.TypeArguments.Select(arg => arg.GenerateFullGenericName());
var argumentString = "<" + string.Join(", ", argumentList) + ">";
baseTypeName += argumentString;
}

classDeclaration = classDeclaration.WithBaseList(BaseList(
SingletonSeparatedList<BaseTypeSyntax>(SimpleBaseType(
IdentifierName(baseTypeName)))));
}

return classDeclaration;
Expand Down
18 changes: 15 additions & 3 deletions src/Pharmacist.Core/Generation/ReflectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,26 @@ public static string GenerateFullGenericName(this IType currentType)

if (currentType.TypeParameterCount > 0)
{
sb.Append('<')
.Append(string.Join(", ", currentType.TypeArguments.Select(GenerateFullGenericName)))
.Append('>');
var isUnbound = currentType.IsUnbound();
var arguments = string.Join(", ", currentType.TypeArguments.Select(GenerateName));
sb.Append('<').Append(arguments).Append('>');

string GenerateName(IType type) => isUnbound ? type.FullName : GenerateFullGenericName(type);
}

return sb.ToString();
}

/// <summary>
/// Checks if the specified generic type definition is unbound.
/// </summary>
/// <param name="definition">The type to check properties for.</param>
/// <returns>Returns true if type is an unbound generic type, otherwise false.</returns>
public static bool IsUnboundGenericTypeDefinition(this ITypeDefinition definition)
{
return definition.TypeParameterCount > 0 && definition.IsUnbound();
}

private static IEnumerable<ITypeDefinition> GetPublicTypeDefinitionsWithEvents(ICompilation compilation)
{
return _publicEventsTypeMapping.GetOrAdd(
Expand Down
Loading