huanld/ProxyGenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for reserved keywords like @object and @string (#18)

Browse Source
This commit is contained in:
Stef Heyenrath
2021-07-31 10:21:12 +02:00
committed by GitHub
parent c1359511d6
commit 541477b545
8 changed files with 188 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ProxyInterfaceSourceGenerator/Extensions/SymbolExtensions.cs
+18 -7
View File
@@ -1,10 +1,21 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using ProxyInterfaceSourceGenerator.Enums;
namespace ProxyInterfaceSourceGenerator.Extensions
{
internal static class SymbolExtensions
{
public static bool IsKeywordOrReserved(this ISymbol symbol)
{
return SyntaxFacts.GetKeywordKind(symbol.Name) != SyntaxKind.None || SyntaxFacts.GetContextualKeywordKind(symbol.Name) != SyntaxKind.None;
}
public static string SanitizedName(this ISymbol symbol)
{
return symbol.IsKeywordOrReserved() ? $"@{symbol.Name}" : symbol.Name;
}
public static string GetRefPrefix(this IParameterSymbol ps)
{
switch (ps.RefKind)
@@ -65,23 +76,23 @@ namespace ProxyInterfaceSourceGenerator.Extensions
var type = !string.IsNullOrEmpty(overrideType) ? overrideType : $"{property.Type}";
return $"{type} {property.Name} {{ {get}{set}}}";
return $"{type} {property.SanitizedName()} {{ {get}{set}}}";
}
public static string ToPropertyTextForClass(this IPropertySymbol property)
{
var get = property.GetMethod != null ? $"get => _Instance.{property.Name}; " : string.Empty;
var set = property.SetMethod != null ? $"set => _Instance.{property.Name} = value; " : string.Empty;
var get = property.GetMethod != null ? $"get => _Instance.{property.SanitizedName()}; " : string.Empty;
var set = property.SetMethod != null ? $"set => _Instance.{property.SanitizedName()} = value; " : string.Empty;
return $"{property.Type} {property.Name} {{ {get}{set}}}";
return $"{property.Type} {property.SanitizedName()} {{ {get}{set}}}";
}
public static string ToPropertyTextForClass(this IPropertySymbol property, string overrideType)
{
var get = property.GetMethod != null ? $"get => _mapper.Map<{overrideType}>(_Instance.{property.Name}); " : string.Empty;
var set = property.SetMethod != null ? $"set => _Instance.{property.Name} = _mapper.Map<{property.Type}>(value); " : string.Empty;
var get = property.GetMethod != null ? $"get => _mapper.Map<{overrideType}>(_Instance.{property.SanitizedName()}); " : string.Empty;
var set = property.SetMethod != null ? $"set => _Instance.{property.SanitizedName()} = _mapper.Map<{property.Type}>(value); " : string.Empty;
return $"{overrideType} {property.Name} {{ {get}{set}}}";
return $"{overrideType} {property.SanitizedName()} {{ {get}{set}}}";
}
}
}
src/ProxyInterfaceSourceGenerator/FileGenerators/PartialInterfacesGenerator.cs
+1 -1
View File
@@ -89,7 +89,7 @@ namespace {ns}
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.Name}");
methodParameters.Add($"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{type} {ps.SanitizedName()}");
}
str.AppendLine($" {GetReplacedType(method.ReturnType, out _)} {method.Name}({string.Join(", ", methodParameters)});");
src/ProxyInterfaceSourceGenerator/FileGenerators/ProxyClassesGenerator.cs
+10 -64
View File
@@ -131,15 +131,15 @@ namespace {ns}
{
if (ps.GetTypeEnum() == TypeEnum.Complex)
{
var type = GetParameterType(ps, out var isReplaced);
methodParameters.Add($"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{type} {ps.Name}");
var type = GetParameterType(ps, out _);
methodParameters.Add($"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{type} {ps.SanitizedName()}");
}
else
{
methodParameters.Add($"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{ps.Type} {ps.Name}");
methodParameters.Add($"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{ps.Type} {ps.SanitizedName()}");
}
invokeParameters.Add($"{ps.GetRefPrefix()}_{ps.Name}");
invokeParameters.Add($"{ps.GetRefPrefix()}{ps.SanitizedName()}_");
}
string returnTypeAsString = GetReplacedType(method.ReturnType, out var returnIsReplaced);
@@ -148,7 +148,7 @@ namespace {ns}
str.AppendLine(" {");
foreach (var ps in method.Parameters)
{
string normalOrMap = $" = {ps.Name}";
string normalOrMap = $" = {ps.SanitizedName()}";
if (ps.RefKind == RefKind.Out)
{
normalOrMap = string.Empty;
@@ -158,11 +158,11 @@ namespace {ns}
var type = GetParameterType(ps, out var isReplaced);
if (isReplaced)
{
normalOrMap = $" = _mapper.Map<{ps.Type}>({ps.Name})";
normalOrMap = $" = _mapper.Map<{ps.Type}>({ps.SanitizedName()})";
}
}
str.AppendLine($" {ps.Type} _{ps.Name}{normalOrMap};");
str.AppendLine($" {ps.Type} {ps.SanitizedName()}_{normalOrMap};");
}
#pragma warning disable RS1024 // Compare symbols correctly
@@ -181,17 +181,17 @@ namespace {ns}
foreach (var ps in method.Parameters.Where(p => p.RefKind == RefKind.Out))
{
string normalOrMap = $" = _{ps.Name}";
string normalOrMap = $" = {ps.SanitizedName()}_";
if (ps.GetTypeEnum() == TypeEnum.Complex)
{
var type = GetParameterType(ps, out var isReplaced);
if (isReplaced)
{
normalOrMap = $" = _mapper.Map<{type}>(_{ps.Name})";
normalOrMap = $" = _mapper.Map<{type}>({ps.SanitizedName()}_)";
}
}
str.AppendLine($" {ps.Name}{normalOrMap};");
str.AppendLine($" {ps.SanitizedName()}{normalOrMap};");
}
if (returnTypeAsString != "void")
@@ -212,59 +212,5 @@ namespace {ns}
return str.ToString();
}
private string GeneratePublicMethodsOld(INamedTypeSymbol symbol)
{
var str = new StringBuilder();
foreach (var method in MemberHelper.GetPublicMethods(symbol))
{
var methodParameters = new List<string>();
var invokeParameters = new List<string>();
foreach (var ps in method.Parameters)
{
if (ps.GetTypeEnum() == TypeEnum.Complex)
{
var type = GetParameterType(ps, out var isReplaced);
methodParameters.Add($"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{type} {ps.Name}");
if (isReplaced)
{
invokeParameters.Add($"_mapper.Map<{ps.Type}>({ps.Name})");
}
else
{
invokeParameters.Add($"{ps.GetRefPrefix()}{ps.Name}");
}
}
else
{
methodParameters.Add($"{ps.GetParamsPrefix()}{ps.GetRefPrefix()}{ps.Type} {ps.Name}");
invokeParameters.Add($"{ps.GetRefPrefix()}{ps.Name}");
}
}
string returnTypeAsString;
string call = $"_Instance.{method.Name}({string.Join(", ", invokeParameters)})";
if (method.ReturnType.GetTypeEnum() == TypeEnum.Complex)
{
returnTypeAsString = GetReplacedType(method.ReturnType, out var isReplaced);
if (isReplaced)
{
call = $"_mapper.Map<{returnTypeAsString}>(_Instance.{method.Name}({string.Join(", ", invokeParameters)}))";
}
}
else
{
returnTypeAsString = method.ReturnType.ToString();
}
str.AppendLine($" public {returnTypeAsString} {method.Name}({string.Join(", ", methodParameters)}) => {call};");
str.AppendLine();
}
return str.ToString();
}
}
}
src/ProxyInterfaceSourceGenerator/Utils/MemberHelper.cs
+3 -2
View File
@@ -1,7 +1,7 @@
using System;
using Microsoft.CodeAnalysis;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.CodeAnalysis;
namespace ProxyInterfaceSourceGenerator.Utils
{
@@ -31,6 +31,7 @@ namespace ProxyInterfaceSourceGenerator.Utils
filter);
}
// TODO : do we need also to check for "SanitizedName()" here?
private static IEnumerable<T> GetPublicMembers<T>(INamedTypeSymbol classSymbol, params Func<T, bool>[] filters) where T : ISymbol
{
var membersQuery = classSymbol.GetMembers().OfType<T>()