Add members-to-ignore to proxy data

This commit is contained in:
Adam Hathcock
2024-05-21 13:56:58 +01:00
parent e5a0b7b7d3
commit 2baba84655
8 changed files with 73 additions and 275 deletions
@@ -64,9 +64,9 @@ internal class PartialInterfacesGenerator : BaseGenerator, IFilesGenerator
var implements = implementedInterfacesNames.Any() ? $" : {string.Join(", ", implementedInterfacesNames)}" : string.Empty;
var @new = extendsProxyClasses.Any() ? "new " : string.Empty;
var (namespaceStart, namespaceEnd) = NamespaceBuilder.Build(ns);
var events = GenerateEvents(classSymbol, proxyData.ProxyBaseClasses);
var properties = GenerateProperties(classSymbol, proxyData.ProxyBaseClasses);
var methods = GenerateMethods(classSymbol, proxyData.ProxyBaseClasses).TrimEnd();
var events = GenerateEvents(classSymbol, proxyData);
var properties = GenerateProperties(classSymbol, proxyData);
var methods = GenerateMethods(classSymbol, proxyData).TrimEnd();
return $@"//----------------------------------------------------------------------------------------
// <auto-generated>
@@ -109,11 +109,11 @@ methods}
return t => !hashSet.Contains(t.Name);
}
private string GenerateProperties(ClassSymbol targetClassSymbol, bool proxyBaseClasses)
private string GenerateProperties(ClassSymbol targetClassSymbol, ProxyData proxyData)
{
var str = new StringBuilder();
foreach (var property in MemberHelper.GetPublicProperties(targetClassSymbol, proxyBaseClasses, InterfaceFilter<IPropertySymbol>()))
foreach (var property in MemberHelper.GetPublicProperties(targetClassSymbol, proxyData, InterfaceFilter<IPropertySymbol>()))
{
var type = GetPropertyType(property, out var isReplaced);
@@ -142,10 +142,10 @@ methods}
return str.ToString();
}
private string GenerateMethods(ClassSymbol targetClassSymbol, bool proxyBaseClasses)
private string GenerateMethods(ClassSymbol targetClassSymbol, ProxyData proxyData)
{
var str = new StringBuilder();
foreach (var method in MemberHelper.GetPublicMethods(targetClassSymbol, proxyBaseClasses, InterfaceFilter<IMethodSymbol>()))
foreach (var method in MemberHelper.GetPublicMethods(targetClassSymbol, proxyData, InterfaceFilter<IMethodSymbol>()))
{
var methodParameters = GetMethodParameters(method.Parameters, true);
var whereStatement = GetWhereStatementFromMethod(method);
@@ -162,10 +162,10 @@ methods}
return str.ToString();
}
private string GenerateEvents(ClassSymbol targetClassSymbol, bool proxyBaseClasses)
private string GenerateEvents(ClassSymbol targetClassSymbol, ProxyData proxyData)
{
var str = new StringBuilder();
foreach (var @event in MemberHelper.GetPublicEvents(targetClassSymbol, proxyBaseClasses, InterfaceFilter<IMethodSymbol>()))
foreach (var @event in MemberHelper.GetPublicEvents(targetClassSymbol, proxyData, InterfaceFilter<IMethodSymbol>()))
{
var ps = @event.First().Parameters.First();
var type = ps.GetTypeEnum() == TypeEnum.Complex ? GetParameterType(ps, out _) : ps.Type.ToString();
@@ -76,10 +76,10 @@ internal partial class ProxyClassesGenerator : BaseGenerator, IFilesGenerator
}
var @abstract = string.Empty; // targetClassSymbol.Symbol.IsAbstract ? "abstract " : string.Empty;
var properties = GeneratePublicProperties(targetClassSymbol, pd.ProxyBaseClasses);
var methods = GeneratePublicMethods(targetClassSymbol, pd.ProxyBaseClasses);
var events = GenerateEvents(targetClassSymbol, pd.ProxyBaseClasses);
var operators = GenerateOperators(targetClassSymbol, pd.ProxyBaseClasses);
var properties = GeneratePublicProperties(targetClassSymbol, pd);
var methods = GeneratePublicMethods(targetClassSymbol, pd);
var events = GenerateEvents(targetClassSymbol, pd);
var operators = GenerateOperators(targetClassSymbol, pd);
var configurationForMapster = string.Empty;
if (Context.ReplacedTypes.Count > 0)
@@ -124,11 +124,11 @@ operators}
{SupportsNullable.IIf("#nullable restore")}";
}
private string GeneratePublicProperties(ClassSymbol targetClassSymbol, bool proxyBaseClasses)
private string GeneratePublicProperties(ClassSymbol targetClassSymbol, ProxyData proxyData)
{
var str = new StringBuilder();
foreach (var property in MemberHelper.GetPublicProperties(targetClassSymbol, proxyBaseClasses))
foreach (var property in MemberHelper.GetPublicProperties(targetClassSymbol, proxyData))
{
var type = GetPropertyType(property, out var isReplaced);
@@ -190,11 +190,11 @@ operators}
return str.ToString();
}
private string GeneratePublicMethods(ClassSymbol targetClassSymbol, bool proxyBaseClasses)
private string GeneratePublicMethods(ClassSymbol targetClassSymbol, ProxyData proxyData)
{
var str = new StringBuilder();
var methods = MemberHelper.GetPublicMethods(targetClassSymbol, proxyBaseClasses);
var methods = MemberHelper.GetPublicMethods(targetClassSymbol, proxyData);
foreach (var method in methods)
{
@@ -305,10 +305,10 @@ operators}
return str.ToString();
}
private string GenerateEvents(ClassSymbol targetClassSymbol, bool proxyBaseClasses)
private string GenerateEvents(ClassSymbol targetClassSymbol, ProxyData proxyData)
{
var str = new StringBuilder();
foreach (var @event in MemberHelper.GetPublicEvents(targetClassSymbol, proxyBaseClasses))
foreach (var @event in MemberHelper.GetPublicEvents(targetClassSymbol, proxyData))
{
var name = @event.Key.GetSanitizedName();
var ps = @event.First().Parameters.First();
@@ -337,16 +337,21 @@ operators}
return str.ToString();
}
private string GenerateOperators(ClassSymbol targetClassSymbol, bool proxyBaseClasses)
private string GenerateOperators(ClassSymbol targetClassSymbol, ProxyData proxyData)
{
var str = new StringBuilder();
foreach (var @operator in MemberHelper.GetPublicStaticOperators(targetClassSymbol, proxyBaseClasses))
foreach (var @operator in MemberHelper.GetPublicStaticOperators(targetClassSymbol, proxyData))
{
foreach (var attribute in @operator.GetAttributesAsList())
{
str.AppendLine($" {attribute}");
}
if (!@operator.Parameters.Any())
{
continue;
}
var parameter = @operator.Parameters.First();
var proxyClassName = targetClassSymbol.Symbol.ResolveProxyClassName();
@@ -23,17 +23,18 @@ internal class ProxyData
public bool ProxyBaseClasses { get; }
public ProxyClassAccessibility Accessibility { get; }
public string[] MembersToIgnore { get; }
public ProxyData(string @namespace,
string namespaceDot,
string shortInterfaceName,
string fullInterfaceName,
string fullQualifiedTypeName,
string shortMetadataTypeName,
string fullMetadataTypeName,
List<string> usings,
bool proxyBaseClasses,
ProxyClassAccessibility accessibility)
string namespaceDot,
string shortInterfaceName,
string fullInterfaceName,
string fullQualifiedTypeName,
string shortMetadataTypeName,
string fullMetadataTypeName,
List<string> usings,
bool proxyBaseClasses,
ProxyClassAccessibility accessibility, string[] membersToIgnore)
{
Namespace = @namespace ?? throw new ArgumentNullException(nameof(@namespace));
NamespaceDot = namespaceDot ?? throw new ArgumentNullException(nameof(namespaceDot));
@@ -45,5 +46,6 @@ internal class ProxyData
Usings = usings ?? throw new ArgumentNullException(nameof(usings));
ProxyBaseClasses = proxyBaseClasses;
Accessibility = accessibility;
MembersToIgnore = membersToIgnore;
}
}
@@ -29,6 +29,11 @@ internal static class AttributeArgumentListParser
foreach (var argument in argumentList.Arguments.Skip(1))
{
if (TryParseAsStringArray(argument.Expression, out var membersToIgnore))
{
result = result with { MembersToIgnore = membersToIgnore };
continue;
}
if (TryParseAsBoolean(argument.Expression, out var proxyBaseClasses))
{
result = result with { ProxyBaseClasses = proxyBaseClasses };
@@ -87,4 +92,23 @@ internal static class AttributeArgumentListParser
value = default;
return false;
}
private static bool TryParseAsStringArray(ExpressionSyntax expressionSyntax, out string[] value)
{
if (expressionSyntax is ImplicitArrayCreationExpressionSyntax lmplicitArrayCreationExpressionSyntax)
{
var strings = new List<string>();
foreach (var expression in lmplicitArrayCreationExpressionSyntax.Initializer.Expressions)
{
if (expression.GetFirstToken().Value is string s)
{
strings.Add(s);
}
}
value = strings.ToArray();
return true;
}
value = Array.Empty<string>();
return false;
}
}
@@ -77,7 +77,8 @@ internal class ProxySyntaxReceiver : ISyntaxContextReceiver
shortMetadataTypeName: metadataName.Split('.').Last(),
usings: usings,
proxyBaseClasses: fluentBuilderAttributeArguments.ProxyBaseClasses,
accessibility: fluentBuilderAttributeArguments.Accessibility
accessibility: fluentBuilderAttributeArguments.Accessibility,
membersToIgnore: fluentBuilderAttributeArguments.MembersToIgnore
);
return true;
@@ -9,7 +9,7 @@ internal static class MemberHelper
public static IReadOnlyList<IPropertySymbol> GetPublicProperties(
ClassSymbol classSymbol,
bool proxyBaseClasses,
ProxyData proxyData,
params Func<IPropertySymbol, bool>[] filters)
{
var allFilters = new List<Func<IPropertySymbol, bool>>(filters)
@@ -17,12 +17,12 @@ internal static class MemberHelper
p => p.Kind == SymbolKind.Property
};
return GetPublicMembers(classSymbol, proxyBaseClasses, allFilters.ToArray()).ToArray();
return GetPublicMembers(classSymbol, proxyData, allFilters.ToArray()).ToArray();
}
public static IReadOnlyList<IMethodSymbol> GetPublicMethods(
ClassSymbol classSymbol,
bool proxyBaseClasses,
ProxyData proxyData,
Func<IMethodSymbol, bool>? filter = null)
{
filter ??= _ => true;
@@ -30,7 +30,7 @@ internal static class MemberHelper
return
GetPublicMembers(
classSymbol,
proxyBaseClasses,
proxyData,
m => m.Kind == SymbolKind.Method,
m => m.MethodKind == MethodKind.Ordinary,
m => !ExcludedMethods.Contains(m.Name),
@@ -40,7 +40,7 @@ internal static class MemberHelper
public static IReadOnlyList<IMethodSymbol> GetPublicStaticOperators(
ClassSymbol classSymbol,
bool proxyBaseClasses,
ProxyData proxyData,
Func<IMethodSymbol, bool>? filter = null)
{
filter ??= _ => true;
@@ -48,7 +48,7 @@ internal static class MemberHelper
return
GetPublicMembers(
classSymbol,
proxyBaseClasses,
proxyData,
m => m.Kind == SymbolKind.Method,
m => m.MethodKind == MethodKind.Conversion,
m => !ExcludedMethods.Contains(m.Name),
@@ -58,7 +58,7 @@ internal static class MemberHelper
public static IReadOnlyList<IGrouping<ISymbol, IMethodSymbol>> GetPublicEvents(
ClassSymbol classSymbol,
bool proxyBaseClasses,
ProxyData proxyData,
Func<IMethodSymbol, bool>? filter = null)
{
filter ??= _ => true;
@@ -67,7 +67,7 @@ internal static class MemberHelper
#pragma warning disable RS1024 // Compare symbols correctly
return GetPublicMembers(
classSymbol,
proxyBaseClasses,
proxyData,
m => m.MethodKind is MethodKind.EventAdd or MethodKind.EventRemove/* || m.MethodKind == MethodKind.EventRaise*/,
filter)
.GroupBy(e => e.AssociatedSymbol)
@@ -79,7 +79,7 @@ internal static class MemberHelper
// TODO : do we need also to check for "SanitizedName()" here?
private static IReadOnlyList<T> GetPublicMembers<T>(
ClassSymbol classSymbol,
bool proxyBaseClasses,
ProxyData proxyData,
params Func<T, bool>[] filters
) where T : ISymbol
{
@@ -94,7 +94,7 @@ internal static class MemberHelper
var ownMembers = membersQuery.ToList();
var ownMemberNames = ownMembers.Select(x => x.Name);
if (!proxyBaseClasses)
if (!proxyData.ProxyBaseClasses)
{
return ownMembers;
}