@@ -1,6 +1,8 @@
|
||||
using System.Collections.Immutable;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Text;
|
||||
using Microsoft.CodeAnalysis;
|
||||
using ProxyInterfaceSourceGenerator.Enums;
|
||||
using ProxyInterfaceSourceGenerator.Extensions;
|
||||
using ProxyInterfaceSourceGenerator.Models;
|
||||
|
||||
@@ -200,4 +202,21 @@ internal abstract class BaseGenerator
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
protected IList<string> GetMethodParameters(ImmutableArray<IParameterSymbol> parameters, bool includeType)
|
||||
{
|
||||
var methodParameters = new List<string>();
|
||||
foreach (var ps in parameters)
|
||||
{
|
||||
string t = string.Empty;
|
||||
if (includeType)
|
||||
{
|
||||
var type = ps.GetTypeEnum() == TypeEnum.Complex ? GetParameterType(ps, out _) : ps.Type.ToString();
|
||||
t = $"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{type} ";
|
||||
}
|
||||
methodParameters.Add($"{t}{ps.GetSanitizedName()}{ps.GetDefaultValue()}");
|
||||
}
|
||||
|
||||
return methodParameters;
|
||||
}
|
||||
}
|
||||
@@ -87,14 +87,18 @@ namespace {ns}
|
||||
foreach (var property in MemberHelper.GetPublicProperties(targetClassSymbol, proxyBaseClasses))
|
||||
{
|
||||
var type = GetPropertyType(property, out var isReplaced);
|
||||
if (isReplaced)
|
||||
|
||||
(string propertyType, string? propertyName, string getSet) = isReplaced ?
|
||||
property.ToPropertyDetails(type) :
|
||||
property.ToPropertyDetails();
|
||||
|
||||
if (property.IsIndexer)
|
||||
{
|
||||
str.AppendLine($" {property.ToPropertyText(type)}");
|
||||
}
|
||||
else
|
||||
{
|
||||
str.AppendLine($" {property.ToPropertyText()}");
|
||||
var methodParameters = GetMethodParameters(property.Parameters, true);
|
||||
propertyName = $"this[{string.Join(", ", methodParameters)}]";
|
||||
}
|
||||
|
||||
str.AppendLine($" {propertyType} {propertyName} {getSet}");
|
||||
str.AppendLine();
|
||||
}
|
||||
|
||||
@@ -106,12 +110,13 @@ namespace {ns}
|
||||
var str = new StringBuilder();
|
||||
foreach (var method in MemberHelper.GetPublicMethods(targetClassSymbol, proxyBaseClasses))
|
||||
{
|
||||
var methodParameters = new List<string>();
|
||||
foreach (var ps in method.Parameters)
|
||||
{
|
||||
var type = ps.GetTypeEnum() == TypeEnum.Complex ? GetParameterType(ps, out _) : ps.Type.ToString();
|
||||
methodParameters.Add($"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{type} {ps.GetSanitizedName()}{ps.GetDefaultValue()}");
|
||||
}
|
||||
var methodParameters = GetMethodParameters(method.Parameters, true);
|
||||
//var methodParameters = new List<string>();
|
||||
//foreach (var ps in method.Parameters)
|
||||
//{
|
||||
// var type = ps.GetTypeEnum() == TypeEnum.Complex ? GetParameterType(ps, out _) : ps.Type.ToString();
|
||||
// methodParameters.Add($"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{type} {ps.GetSanitizedName()}{ps.GetDefaultValue()}");
|
||||
//}
|
||||
|
||||
var whereStatement = GetWhereStatementFromMethod(method);
|
||||
|
||||
|
||||
@@ -130,14 +130,45 @@ namespace {pd.Namespace}
|
||||
{
|
||||
var type = GetPropertyType(property, out var isReplaced);
|
||||
|
||||
var instance = !property.IsStatic ?
|
||||
"_Instance" :
|
||||
$"{targetClassSymbol.Symbol}";
|
||||
|
||||
var propertyName = property.GetSanitizedName();
|
||||
var instancePropertyName = $"{instance}.{propertyName}";
|
||||
if (property.IsIndexer)
|
||||
{
|
||||
var parameters = GetMethodParameters(property.Parameters, true);
|
||||
propertyName = $"this[{string.Join(", ", parameters)}]";
|
||||
|
||||
var instanceParameters = GetMethodParameters(property.Parameters, false);
|
||||
instancePropertyName = $"{instance}[{string.Join(", ", instanceParameters)}]";
|
||||
}
|
||||
|
||||
var overrideOrVirtual = string.Empty;
|
||||
if (property.IsOverride)
|
||||
{
|
||||
overrideOrVirtual = "override ";
|
||||
}
|
||||
else if (property.IsVirtual)
|
||||
{
|
||||
overrideOrVirtual = "virtual ";
|
||||
}
|
||||
|
||||
string get;
|
||||
string set;
|
||||
if (isReplaced)
|
||||
{
|
||||
str.AppendLine($" public {property.ToPropertyTextForClass(targetClassSymbol, type)}");
|
||||
get = property.GetMethod != null ? $"get => _mapper.Map<{type}>({instancePropertyName}); " : string.Empty;
|
||||
set = property.SetMethod != null ? $"set => {instancePropertyName} = _mapper.Map<{property.Type}>(value); " : string.Empty;
|
||||
}
|
||||
else
|
||||
{
|
||||
str.AppendLine($" public {property.ToPropertyTextForClass(targetClassSymbol)}");
|
||||
get = property.GetMethod != null ? $"get => {instancePropertyName}; " : string.Empty;
|
||||
set = property.SetMethod != null ? $"set => {instancePropertyName} = value; " : string.Empty;
|
||||
}
|
||||
|
||||
str.AppendLine($" public {overrideOrVirtual}{type} {propertyName} {{ {get}{set}}}");
|
||||
str.AppendLine();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user