From 493935a2f77a55defb0c4416a92a57acdfd97842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Sat, 7 Jan 2023 10:46:31 +0100 Subject: [PATCH] fix(packets): correctly deserialize list with nullable elements inline --- .../InlineConverterGenerators/BasicInlineConverterGenerator.cs | 2 +- .../InlineConverterGenerators/ListInlineConverterGenerator.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/BasicInlineConverterGenerator.cs b/Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/BasicInlineConverterGenerator.cs index 7acefd0..1580abe 100644 --- a/Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/BasicInlineConverterGenerator.cs +++ b/Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/BasicInlineConverterGenerator.cs @@ -51,7 +51,7 @@ public class BasicInlineConverterGenerator : IInlineConverterGenerator { var type = typeSyntax is not null ? typeSyntax.ToString().TrimEnd('?') - : typeSymbol?.ToString(); + : typeSymbol?.ToString().TrimEnd('?'); if (type is null) { throw new Exception("TypeSyntax or TypeSymbol has to be non null."); diff --git a/Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/ListInlineConverterGenerator.cs b/Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/ListInlineConverterGenerator.cs index 4a76634..582688e 100644 --- a/Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/ListInlineConverterGenerator.cs +++ b/Packets/NosSmooth.PacketSerializersGenerator/InlineConverterGenerators/ListInlineConverterGenerator.cs @@ -96,7 +96,7 @@ public class ListInlineConverterGenerator : IInlineConverterGenerator private string GetMethodName(ITypeSymbol genericArgumentType) { return - $"ParseList{genericArgumentType.ToString().Replace('.', '_')}{((genericArgumentType.IsNullable() ?? false) ? "Nullable" : string.Empty)}"; + $"ParseList{genericArgumentType.ToString().TrimEnd('?').Replace('.', '_')}{((genericArgumentType.IsNullable() ?? false) ? "Nullable" : string.Empty)}"; } /// -- 2.48.1