Save method overloads in name checker

Signed-off-by: Ben Sherman <bentshermann@gmail.com>

Author: bentsherman

modules/nf-lang/src/main/java/nextflow/config/control/VariableScopeVisitor.java

@@ -269,9 +269,11 @@ private void checkMethodCall(MethodCallExpression node) {
         if( !node.isImplicitThis() )
             return;
         var name = node.getMethodAsString();
-        var defNode = vsc.findDslFunction(name, node);
-        if( defNode != null )
-            node.putNodeMetaData(ASTNodeMarker.METHOD_TARGET, defNode);
+        var methods = vsc.findDslFunction(name, node);
+        if( methods.size() == 1 )
+            node.putNodeMetaData(ASTNodeMarker.METHOD_TARGET, methods.get(0));
+        else if( !methods.isEmpty() )
+            node.putNodeMetaData(ASTNodeMarker.METHOD_OVERLOADS, methods);
         else if( !KEYWORDS.contains(name) )
             vsc.addError("`" + name + "` is not defined", node.getMethod());
     }

modules/nf-lang/src/main/java/nextflow/script/ast/ASTNodeMarker.java

@@ -39,6 +39,9 @@ public enum ASTNodeMarker {
     // the verbatim text of a Groovy-style type annotation (ClassNode)
     LEGACY_TYPE,
 
+    // the list of candidate MethodNode's for a MethodCallExpression
+    METHOD_OVERLOADS,
+
     // the MethodNode targeted by a MethodCallExpression
     METHOD_TARGET,
 

modules/nf-lang/src/main/java/nextflow/script/control/VariableScopeChecker.java

@@ -18,6 +18,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.IdentityHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -234,31 +235,42 @@ private static PropertyNode wrapMethodAsVariable(MethodNode mn, String name) {
      *
      * @param name
      * @param node
+     * @param directive
      */
-    public MethodNode findDslFunction(String name, ASTNode node) {
+    public List<MethodNode> findDslFunction(String name, ASTNode node, boolean directive) {
         VariableScope scope = currentScope;
         while( scope != null ) {
             ClassNode cn = scope.getClassScope();
             while( cn != null ) {
-                for( var mn : cn.getMethods() ) {
-                    // built-in functions are methods not annotated as @Constant
-                    if( findAnnotation(mn, Constant.class).isPresent() )
-                        continue;
-                    if( !name.equals(mn.getName()) )
-                        continue;
-                    if( findAnnotation(mn, Deprecated.class).isPresent() )
-                        addParanoidWarning("`" + name + "` is deprecated and will be removed in a future version", node);
-                    return mn;
-                }
-    
+                // built-in functions are methods not annotated as @Constant
+                var methods = cn.getDeclaredMethods(name).stream()
+                    .filter(mn -> !findAnnotation(mn, Constant.class).isPresent())
+                    .toList();
+
+                if( methods.size() == 1 && findAnnotation(methods.get(0), Deprecated.class).isPresent() )
+                    addParanoidWarning("`" + name + "` is deprecated and will be removed in a future version", node);
+
+                if( !methods.isEmpty() )
+                    return methods;
+
+                // directives can only come from the immediate dsl scope
+                if( directive && scope == currentScope )
+                    return null;
+
                 cn = cn.getInterfaces().length > 0
                     ? cn.getInterfaces()[0]
                     : null;
             }
             scope = scope.getParent();
         }
 
-        return includes.get(name);
+        return includes.containsKey(name)
+            ? List.of(includes.get(name))
+            : Collections.emptyList();
+    }
+
+    public List<MethodNode> findDslFunction(String name, ASTNode node) {
+        return findDslFunction(name, node, false);
     }
 
     public void addWarning(String message, String tokenText, ASTNode node) {

modules/nf-lang/src/main/java/nextflow/script/control/VariableScopeVisitor.java

@@ -327,9 +327,11 @@ private MethodCallExpression checkDirective(Statement node, String typeLabel, bo
             return null;
         }
         var name = call.getMethodAsString();
-        var mn = vsc.findDslFunction(name, call.getMethod());
-        if( mn != null )
-            call.putNodeMetaData(ASTNodeMarker.METHOD_TARGET, mn);
+        var methods = vsc.findDslFunction(name, call, true);
+        if( methods.size() == 1 )
+            call.putNodeMetaData(ASTNodeMarker.METHOD_TARGET, methods.get(0));
+        else if( !methods.isEmpty() )
+            node.putNodeMetaData(ASTNodeMarker.METHOD_OVERLOADS, methods);
         else
             vsc.addError("Unrecognized " + typeLabel + " `" + name + "`", node);
         return call;
@@ -580,12 +582,16 @@ private void checkMethodCall(MethodCallExpression node) {
         if( !node.isImplicitThis() )
             return;
         var name = node.getMethodAsString();
-        var mn = vsc.findDslFunction(name, node.getMethod());
-        if( mn != null ) {
+        var methods = vsc.findDslFunction(name, node);
+        if( methods.size() == 1 ) {
+            var mn = methods.get(0);
             if( VariableScopeChecker.isDataflowMethod(mn) )
                 checkDataflowMethod(node, mn);
             node.putNodeMetaData(ASTNodeMarker.METHOD_TARGET, mn);
         }
+        else if( !methods.isEmpty() ) {
+            node.putNodeMetaData(ASTNodeMarker.METHOD_OVERLOADS, methods);
+        }
         else if( !KEYWORDS.contains(name) ) {
             vsc.addError("`" + name + "` is not defined", node.getMethod());
         }

modules/nf-lang/src/main/java/nextflow/script/types/TaskConfig.java

@@ -214,7 +214,7 @@ public interface TaskConfig {
 
         [Read more](https://nextflow.io/docs/latest/reference/process.html#ext)
     """)
-    Map<String,?> getExt();
+    Map<String,String> getExt();
 
     @Constant("fair")
     @Description("""

modules/nf-lang/src/main/java/nextflow/script/types/Types.java

@@ -129,7 +129,7 @@ private static String typeName(ClassNode type) {
             builder.append(type.getUnresolvedName());
         else if( type.getNodeMetaData(ASTNodeMarker.FULLY_QUALIFIED) != null )
             builder.append(type.getName());
-        else if( hasTypeClass(type) )
+        else if( type.isResolved() )
             builder.append(getName(type.getTypeClass()));
         else
             builder.append(getName(type.getNameWithoutPackage()));
@@ -154,16 +154,6 @@ private static void genericsTypeNames(GenericsType[] genericsTypes, StringBuilde
         }
     }
 
-    private static boolean hasTypeClass(ClassNode type) {
-        try {
-            type.getTypeClass();
-            return true;
-        }
-        catch( GroovyBugError e ) {
-            return false;
-        }
-    }
-
     public static String getName(Class type) {
         return getName(type.getSimpleName());
     }