Record argument type's arguments #37

Signed-off-by: Mārtiņš Avots <martins.avots@splitcells.net>

Author: martins-avots

projects/net.splitcells.gel.editor/src/main/java/net/splitcells/gel/editor/geal/FunctionCallRecord.java

@@ -35,8 +35,7 @@
 
 import java.util.Optional;
 
-import static net.splitcells.dem.data.set.list.Lists.listWithValuesOf;
-import static net.splitcells.dem.data.set.list.Lists.toList;
+import static net.splitcells.dem.data.set.list.Lists.*;
 import static net.splitcells.dem.data.set.map.Maps.map;
 import static net.splitcells.dem.lang.CommonMarkUtils.joinDocuments;
 import static net.splitcells.dem.lang.tree.TreeI.tree;
@@ -79,6 +78,7 @@ public static FunctionCallRecord functionCallRecord(Optional<Object> argSubject,
     boolean isRecording;
     @Getter Optional<Boolean> subjectAbsent = Optional.empty();
     @Getter Map<Integer, Class<?>> argumentTypes = map();
+    @Getter Map<Integer, List<Class<?>>> argumentTypeArguments = map();
 
     private FunctionCallRecord(Optional<Object> argSubject, FunctionCallDesc argFunctionCall, Editor argContext, String argName, int argVariation, boolean argIsRecording) {
         name = argName;
@@ -127,6 +127,7 @@ public void requireArgumentMinimalCount(int requiredMinimum) {
 
     public NameDesc parseArgumentAsType(int argument, String... validValues) {
         if (isRecording) {
+            argumentTypes.ensurePresence(argument, NameDesc.class);
             return null;
         }
         val argumentAsType = parseArgumentAsType(argument);
@@ -142,6 +143,7 @@ public NameDesc parseArgumentAsType(int argument, String... validValues) {
 
     public NameDesc parseArgumentAsType(int argument) {
         if (isRecording) {
+            argumentTypes.ensurePresence(argument, NameDesc.class);
             return null;
         }
         final var first = context.parse(functionCall.getArguments().get(argument));
@@ -162,6 +164,7 @@ public NameDesc parseArgumentAsType(int argument) {
 
     public StringDesc parseArgumentAsStringDesc(int argument) {
         if (isRecording) {
+            argumentTypes.ensurePresence(argument, StringDesc.class);
             return stringDesc("", emptySourceCodeQuote());
         }
         final var first = context.parse(functionCall.getArguments().get(argument));
@@ -184,7 +187,7 @@ public void failBecauseOfInvalidType(int argument, NameDesc actualType, String..
         if (isRecording) {
             return;
         }
-        final var allowedTypeList = Lists.list(allowedTypes).stream()
+        final var allowedTypeList = list(allowedTypes).stream()
                 .map(at -> "the " + at + " type")
                 .reduce((a, b) -> a + " or " + b)
                 .orElseThrow();
@@ -266,6 +269,7 @@ public List<Attribute<? extends Object>> parseAttributeArguments() {
 
     public Attribute<? extends Object> parseAttributeArgument(int argument) {
         if (isRecording) {
+            argumentTypes.ensurePresence(argument, Attribute.class);
             return null;
         }
         final var a = functionCall.getArguments().get(argument);
@@ -287,6 +291,8 @@ public Attribute<? extends Object> parseAttributeArgument(int argument) {
 
     public <T> Attribute<T> parseAttributeArgument(Class<? extends T> type, int argument) {
         if (isRecording) {
+            argumentTypes.ensurePresence(argument, Attribute.class);
+            argumentTypeArguments.ensurePresence(argument, list(type));
             return null;
         }
         final Attribute<?> distanceAttribute = parseAttributeArgument(argument);
@@ -307,7 +313,7 @@ public <T> Attribute<T> parseAttributeArgument(Class<? extends T> type, int argu
 
     public <T> T parseArgument(Class<? extends T> type, int argument) {
         if (isRecording) {
-            argumentTypes.put(argument, type);
+            argumentTypes.ensurePresence(argument, type);
             return null;
         }
         final var parsed = context.parse(functionCall.getArguments().get(argument));