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

Properly convert type to globals with namespace

Browse Source
This commit is contained in:
Adam Hathcock
2024-09-03 09:19:40 +01:00
parent 80c3145257
commit 657fb078a8
4 changed files with 21 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Speckle.InterfaceGenerator/AutoInterfaceGenerator.cs
+8 -19
View File
@@ -313,11 +313,7 @@ public class AutoInterfaceGenerator : ISourceGenerator
if (propertySymbol.IsIndexer)
{
writer.Write("{0} this[", propertySymbol.Type.GetNamespaceAndType());
writer.WriteJoin(
", ",
propertySymbol.Parameters,
(x, p) => WriteMethodParam(x, p, false)
);
writer.WriteJoin(", ", propertySymbol.Parameters, WriteMethodParam);
writer.Write("] ");
}
else
@@ -372,22 +368,15 @@ public class AutoInterfaceGenerator : ISourceGenerator
if (methodSymbol.IsGenericMethod)
{
writer.Write("<");
writer.WriteJoin(", ", methodSymbol.TypeParameters.Select(x => x.Name));
writer.WriteJoin(
", ",
methodSymbol.TypeParameters.Select(x => x.GetNamespaceAndType())
);
writer.Write(">");
}
writer.Write("(");
writer.WriteJoin(
", ",
methodSymbol.Parameters,
(x, p) =>
WriteMethodParam(
x,
p,
owner.TypeParameters.Any(t => t.Name == p.Type.Name)
|| methodSymbol.TypeParameters.Any(t => t.Name == p.Type.Name)
)
);
writer.WriteJoin(", ", methodSymbol.Parameters, WriteMethodParam);
writer.Write(")");
@@ -399,7 +388,7 @@ public class AutoInterfaceGenerator : ISourceGenerator
writer.WriteLine(";");
}
private static void WriteMethodParam(TextWriter writer, IParameterSymbol param, bool isGeneric)
private static void WriteMethodParam(TextWriter writer, IParameterSymbol param)
{
if (param.IsParams)
{
@@ -419,7 +408,7 @@ public class AutoInterfaceGenerator : ISourceGenerator
break;
}
writer.Write(isGeneric ? param.Type : param.Type.GetNamespaceAndType());
writer.Write(param.Type.GetNamespaceAndType());
writer.Write(" ");
if (StringExtensions.IsCSharpKeyword(param.Name))