From 3f193501d0a4e99a917437ec7d835639e50ed0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Thu, 30 Dec 2021 10:56:26 +0100 Subject: [PATCH] fix: syntax errors in list attribute generator --- .../PacketContextListAttributeGenerator.cs | 7 +++---- .../PacketListIndexAttributeGenerator.cs | 10 ++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Core/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketContextListAttributeGenerator.cs b/Core/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketContextListAttributeGenerator.cs index 47063c9..c5425d9 100644 --- a/Core/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketContextListAttributeGenerator.cs +++ b/Core/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketContextListAttributeGenerator.cs @@ -39,7 +39,7 @@ public class PacketContextListAttributeGenerator : IParameterGenerator if (parameterInfo.NamedAttributeArguments.ContainsKey("InnerSeparator") && parameterInfo.NamedAttributeArguments["InnerSeparator"] is not null) { innerSeparator = parameterInfo.NamedAttributeArguments["InnerSeparator"]!.ToString()[0]; - textWriter.WriteLine($"stringEnumerator.PushLevel('{parameterInfo.NamedAttributeArguments["InnerSeparator"]}');"); + textWriter.WriteLine($"builder.PushLevel('{parameterInfo.NamedAttributeArguments["InnerSeparator"]}');"); } textWriter.WriteLine($"builder.PrepareLevel('{innerSeparator}')"); @@ -74,18 +74,17 @@ builder.PopLevel(); listSeparator = parameterInfo.NamedAttributeArguments["ListSeparator"]!.ToString()[0]; } - textWriter.WriteLine($"stringEnumerator.PushLevel('{listSeparator}')"); + textWriter.WriteLine($"stringEnumerator.PushLevel('{listSeparator}');"); var innerSeparator = '.'; if (parameterInfo.NamedAttributeArguments.ContainsKey("InnerSeparator") && parameterInfo.NamedAttributeArguments["InnerSeparator"] is not null) { innerSeparator = parameterInfo.NamedAttributeArguments["InnerSeparator"]!.ToString()[0]; - textWriter.WriteLine($"stringEnumerator.PushLevel('{parameterInfo.NamedAttributeArguments["InnerSeparator"]}');"); } var maxTokensVariable = parameterInfo.IndexedAttributeArguments[1]!.ToString(); - textWriter.WriteLine($"stringEnumerator.PrepareLevel('{innerSeparator}', {maxTokensVariable})"); + textWriter.WriteLine($"stringEnumerator.PrepareLevel('{innerSeparator}', {maxTokensVariable});"); var semanticModel = parameterInfo.Compilation.GetSemanticModel(recordDeclarationSyntax.SyntaxTree); var type = semanticModel.GetTypeInfo(parameterInfo.Parameter.Type!).Type; diff --git a/Core/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketListIndexAttributeGenerator.cs b/Core/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketListIndexAttributeGenerator.cs index a607f11..847f1e7 100644 --- a/Core/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketListIndexAttributeGenerator.cs +++ b/Core/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketListIndexAttributeGenerator.cs @@ -34,16 +34,15 @@ public class PacketListIndexAttributeGenerator : IParameterGenerator listSeparator = parameterInfo.NamedAttributeArguments["ListSeparator"]!.ToString()[0]; } - textWriter.WriteLine($"builder.PushLevel('{listSeparator}')"); + textWriter.WriteLine($"builder.PushLevel('{listSeparator}');"); var innerSeparator = '.'; if (parameterInfo.NamedAttributeArguments.ContainsKey("InnerSeparator") && parameterInfo.NamedAttributeArguments["InnerSeparator"] is not null) { innerSeparator = parameterInfo.NamedAttributeArguments["InnerSeparator"]!.ToString()[0]; - textWriter.WriteLine($"stringEnumerator.PushLevel('{parameterInfo.NamedAttributeArguments["InnerSeparator"]}');"); } - textWriter.WriteLine($"builder.PrepareLevel('{innerSeparator}')"); + textWriter.WriteLine($"builder.PrepareLevel('{innerSeparator}');"); textWriter.WriteLine($@" var {parameterInfo.Name}Result = _typeConverterRepository.Serialize(obj.{parameterInfo.Name}, builder); @@ -75,13 +74,12 @@ builder.PopLevel(); listSeparator = parameterInfo.NamedAttributeArguments["ListSeparator"]!.ToString()[0]; } - textWriter.WriteLine($"stringEnumerator.PushLevel('{listSeparator}')"); + textWriter.WriteLine($"stringEnumerator.PushLevel('{listSeparator}');"); var innerSeparator = '.'; if (parameterInfo.NamedAttributeArguments.ContainsKey("InnerSeparator") && parameterInfo.NamedAttributeArguments["InnerSeparator"] is not null) { innerSeparator = parameterInfo.NamedAttributeArguments["InnerSeparator"]!.ToString()[0]; - textWriter.WriteLine($"stringEnumerator.PushLevel('{parameterInfo.NamedAttributeArguments["InnerSeparator"]}');"); } var maxTokens = "null"; @@ -90,7 +88,7 @@ builder.PopLevel(); maxTokens = parameterInfo.NamedAttributeArguments["Length"]!.ToString(); } - textWriter.WriteLine($"stringEnumerator.PrepareLevel('{innerSeparator}', {maxTokens ?? "null"})"); + textWriter.WriteLine($"stringEnumerator.PrepareLevel('{innerSeparator}', {maxTokens ?? "null"});"); var semanticModel = parameterInfo.Compilation.GetSemanticModel(recordDeclarationSyntax.SyntaxTree); var type = semanticModel.GetTypeInfo(parameterInfo.Parameter.Type!).Type; -- 2.49.0