Add parameter for default imports in ResolveVisitor

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

Author: bentsherman

modules/compiler/src/main/java/script/control/ResolveVisitor.java

@@ -56,7 +56,7 @@
 
 public class ResolveVisitor extends ScriptExpressionTransformer {
 
-    public static final String[] DEFAULT_IMPORTS = { "java.lang.", "java.util.", "java.io.", "java.net.", "groovy.lang.", "groovy.util." };
+    public static final String[] DEFAULT_PACKAGE_PREFIXES = { "java.lang.", "java.util.", "java.io.", "java.net.", "groovy.lang.", "groovy.util." };
 
     public static final String[] EMPTY_STRING_ARRAY = new String[0];
 
@@ -66,12 +66,15 @@ public class ResolveVisitor extends ScriptExpressionTransformer {
 
     private ClassNodeResolver classNodeResolver = new ClassNodeResolver();
 
-    private List<ClassNode> libClasses;
+    private List<ClassNode> defaultImports;
 
-    public ResolveVisitor(SourceUnit sourceUnit, CompilationUnit compilationUnit, List<ClassNode> libClasses) {
+    private List<ClassNode> libImports;
+
+    public ResolveVisitor(SourceUnit sourceUnit, CompilationUnit compilationUnit, List<ClassNode> defaultImports, List<ClassNode> libImports) {
         this.sourceUnit = sourceUnit;
         this.compilationUnit = compilationUnit;
-        this.libClasses = libClasses;
+        this.defaultImports = defaultImports;
+        this.libImports = libImports;
     }
 
     @Override
@@ -182,7 +185,7 @@ protected boolean resolveFromModule(ClassNode type) {
 
     protected boolean resolveFromLibImports(ClassNode type) {
         var name = type.getName();
-        for( var cn : libClasses ) {
+        for( var cn : libImports ) {
             if( name.equals(cn.getName()) ) {
                 type.setRedirect(cn);
                 return true;
@@ -194,7 +197,7 @@ protected boolean resolveFromLibImports(ClassNode type) {
     protected boolean resolveFromDefaultImports(ClassNode type) {
         // resolve from script imports
         var typeName = type.getName();
-        for( var cn : Types.TYPES ) {
+        for( var cn : defaultImports ) {
             if( typeName.equals(cn.getNameWithoutPackage()) ) {
                 type.setRedirect(cn);
                 return true;
@@ -207,7 +210,7 @@ protected boolean resolveFromDefaultImports(ClassNode type) {
                 return true;
         }
         // resolve from default imports
-        if( resolveFromDefaultImports(type, DEFAULT_IMPORTS) ) {
+        if( resolveFromDefaultImports(type, DEFAULT_PACKAGE_PREFIXES) ) {
             return true;
         }
         if( "BigInteger".equals(typeName) ) {
@@ -223,7 +226,7 @@ protected boolean resolveFromDefaultImports(ClassNode type) {
 
     private static final Map<String, Set<String>> DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE = new UnlimitedConcurrentCache<>();
     static {
-        DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.putAll(VMPluginFactory.getPlugin().getDefaultImportClasses(DEFAULT_IMPORTS));
+        DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.putAll(VMPluginFactory.getPlugin().getDefaultImportClasses(DEFAULT_PACKAGE_PREFIXES));
     }
 
     protected boolean resolveFromDefaultImports(ClassNode type, String[] packagePrefixes) {
@@ -233,7 +236,7 @@ protected boolean resolveFromDefaultImports(ClassNode type, String[] packagePref
             if( redirect != null ) {
                 type.setRedirect(redirect);
                 // don't update cache when using a cached lookup
-                if( packagePrefixes == DEFAULT_IMPORTS ) {
+                if( packagePrefixes == DEFAULT_PACKAGE_PREFIXES ) {
                     var packagePrefixSet = DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.computeIfAbsent(typeName, key -> new HashSet<>(2));
                     packagePrefixSet.add(packagePrefix);
                 }

modules/language-server/src/main/java/nextflow/lsp/services/script/ScriptAstCache.java

@@ -51,6 +51,7 @@
 import nextflow.script.control.ResolveVisitor;
 import nextflow.script.control.VariableScopeVisitor;
 import nextflow.script.parser.ScriptParserPluginFactory;
+import nextflow.script.types.Types;
 import org.codehaus.groovy.GroovyBugError;
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.ClassNode;
@@ -100,15 +101,15 @@ public void initialize(String rootUri) {
     @Override
     protected SourceUnit buildAST(URI uri, FileCache fileCache) {
         // compile Groovy classes in lib directory
-        var libClasses = getLibClasses();
+        var libImports = getLibImports();
 
         // phase 1: syntax resolution
         var sourceUnit = compiler.compile(uri, fileCache);
 
         // phase 2: name resolution
         // NOTE: must be done before visiting parents because it transforms nodes
         if( sourceUnit != null ) {
-            new ResolveVisitor(sourceUnit, compilationUnit, libClasses).visit();
+            new ResolveVisitor(sourceUnit, compilationUnit, Types.TYPES, libImports).visit();
             new ParameterSchemaVisitor(sourceUnit).visit();
         }
         return sourceUnit;
@@ -125,7 +126,7 @@ private static class Entry {
 
     private Map<URI,Entry> libCache = new HashMap<>();
 
-    private List<ClassNode> getLibClasses() {
+    private List<ClassNode> getLibImports() {
         if( rootUri == null )
             return Collections.emptyList();