5 files changed, 16 insertions(+), 25 deletions(-)

M Packets/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketConditionalIndexAttributeGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketContextListAttributeGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketGreedyIndexAttributeGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketIndexAttributeGenerator.cs
M Packets/NosSmooth.PacketSerializersGenerator/AttributeGenerators/PacketListIndexAttributeGenerator.cs

@@ 260,6 260,10 @@ public class PacketConditionalIndexAttributeGenerator : IParameterGenerator
         {
             generator.StartOptionalCheck(parameter, packetInfo.Name);
         }
+        else
+        {
+            generator.ValidateNotLast(parameter.Name);
+        }
 
         var afterSeparator = attribute.GetNamedValue<char?>("AfterSeparator", null);
         if (afterSeparator is not null)


@@ 288,11 292,6 @@ public class PacketConditionalIndexAttributeGenerator : IParameterGenerator
             generator.PopLevel();
         }
 
-        if (!packetInfo.Parameters.IsLast)
-        {
-            generator.ValidateNotLast(parameter.Name);
-        }
-
         // end is last token if body
         if (parameter.IsOptional())
         {

@@ 102,6 102,10 @@ public class PacketContextListAttributeGenerator : IParameterGenerator
         {
             generator.StartOptionalCheck(parameter, packetInfo.Name);
         }
+        else
+        {
+            generator.ValidateNotLast(parameter.Name);
+        }
 
         var afterSeparator = attribute.GetNamedValue<char?>("AfterSeparator", null);
         if (afterSeparator is not null)


@@ 127,11 131,6 @@ public class PacketContextListAttributeGenerator : IParameterGenerator
 
         generator.AssignLocalVariable(parameter);
 
-        if (!packetInfo.Parameters.IsLast)
-        {
-            generator.ValidateNotLast(parameter.Name);
-        }
-
         // end is last token if body
         if (parameter.IsOptional())
         {

@@ 68,6 68,10 @@ public class PacketGreedyIndexAttributeGenerator : IParameterGenerator
         {
             generator.StartOptionalCheck(parameter, packetInfo.Name);
         }
+        else
+        {
+            generator.ValidateNotLast(parameter.Name);
+        }
 
         var afterSeparator = attribute.GetNamedValue<char?>("AfterSeparator", null);
         if (afterSeparator is not null)


@@ 99,11 103,6 @@ public class PacketGreedyIndexAttributeGenerator : IParameterGenerator
             generator.PopLevel();
         }
 
-        if (!packetInfo.Parameters.IsLast)
-        {
-            generator.ValidateNotLast(parameter.Name);
-        }
-
         // end is last token if body
         if (parameter.IsOptional())
         {

@@ 111,6 111,10 @@ public class PacketIndexAttributeGenerator : IParameterGenerator
         {
             generator.StartOptionalCheck(parameter, packetInfo.Name);
         }
+        else
+        {
+            generator.ValidateNotLast(parameter.Name);
+        }
 
         var afterSeparator = attribute.GetNamedValue<char?>("AfterSeparator", null);
         if (afterSeparator is not null)


@@ 139,11 143,6 @@ public class PacketIndexAttributeGenerator : IParameterGenerator
             generator.PopLevel();
         }
 
-        if (!packetInfo.Parameters.IsLast)
-        {
-            generator.ValidateNotLast(parameter.Name);
-        }
-
         // end is last token if body
         if (parameter.IsOptional())
         {

@@ 144,11 144,6 @@ public class PacketListIndexAttributeGenerator : IParameterGenerator
 
         generator.AssignLocalVariable(parameter, false);
 
-        if (!packetInfo.Parameters.IsLast)
-        {
-            generator.ValidateNotLast(parameter.Name);
-        }
-
         // end is last token if body
         if (parameter.IsOptional())
         {