Fix formatting of channel factories

Signed-off-by: Ben Sherman <[email protected]>

Author: bentsherman

modules/nf-lang/src/main/java/nextflow/script/formatter/Formatter.java

@@ -284,7 +284,7 @@ public void visitMethodCallExpression(MethodCallExpression node) {
             visit(receiver);
             if( inWrappedMethodChain ) {
                 incIndent();
-                if( !(receiver instanceof ClassExpression) ) {
+                if( !nextflow.script.types.Types.isNamespace(receiver.getType()) ) {
                     appendNewLine();
                     appendIndent();
                 }

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

@@ -25,6 +25,7 @@
 import groovy.lang.GString;
 import groovy.lang.Tuple2;
 import nextflow.script.ast.ASTNodeMarker;
+import nextflow.script.dsl.DslScope;
 import nextflow.script.dsl.Namespace;
 import nextflow.script.types.shim.ShimType;
 import org.codehaus.groovy.GroovyBugError;
@@ -91,15 +92,32 @@ public static boolean isAssignableFrom(Class target, Class source) {
         return target.equals(source);
     }
 
+    /**
+     * Determine whether a class is a DSL scope.
+     *
+     * @param cn
+     */
+    public static boolean isDslScope(ClassNode cn) {
+        return cn.implementsInterface(ClassHelper.makeCached(DslScope.class));
+    }
+
+    /**
+     * Determine whether a class is a namespace.
+     *
+     * @param cn
+     */
+    public static boolean isNamespace(ClassNode cn) {
+        return cn.implementsInterface(ClassHelper.makeCached(Namespace.class));
+    }
+
     /**
      * Given a method node corresponding to a built-in constant, determine
      * whether the constant is a namespace.
      *
      * @param mn
      */
     public static boolean isNamespace(MethodNode mn) {
-        var cn = mn.getReturnType();
-        return hasTypeClass(cn) && Namespace.class.isAssignableFrom(cn.getTypeClass());
+        return isNamespace(mn.getReturnType());
     }
 
     /**

modules/nf-lang/src/test/groovy/nextflow/script/formatter/ScriptFormatterTest.groovy

@@ -341,11 +341,11 @@ class ScriptFormatterTest extends Specification {
         expect:
         checkFormat(
             '''\
-            Channel.of( 1, 2, 3 )
+            channel.of( 1, 2, 3 )
                 .multiMap{v->foo:bar:v}.set{result}
             ''',
             '''\
-            Channel.of(1, 2, 3)
+            channel.of(1, 2, 3)
                 .multiMap { v -> foo: bar: v }
                 .set { result }
             '''