Add formatting option for Mahesh form

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

Author: bentsherman

modules/compiler/src/main/java/script/formatter/Formatter.java

@@ -69,7 +69,7 @@
 public class Formatter extends CodeVisitorSupport {
 
     public static String prettyPrintTypeName(ClassNode type) {
-        var fmt = new Formatter(new FormattingOptions(0, false, false));
+        var fmt = new Formatter(new FormattingOptions(0, false));
         fmt.visitTypeName(type);
         return fmt.toString();
     }

modules/compiler/src/main/java/script/formatter/FormattingOptions.java

@@ -18,5 +18,10 @@
 public record FormattingOptions(
     int tabSize,
     boolean insertSpaces,
-    boolean harshilAlignment
-) {}
+    boolean harshilAlignment,
+    boolean maheshForm
+) {
+    public FormattingOptions(int tabSize, boolean insertSpaces) {
+        this(tabSize, insertSpaces, false, false);
+    }
+}

modules/compiler/src/main/java/script/formatter/ScriptFormattingVisitor.java

@@ -339,10 +339,8 @@ public void visitProcess(ProcessNode node) {
             visitDirectives(node.inputs);
             fmt.appendNewLine();
         }
-        if( node.outputs instanceof BlockStatement ) {
-            fmt.appendIndent();
-            fmt.append("output:\n");
-            visitDirectives(node.outputs);
+        if( !options.maheshForm() && node.outputs instanceof BlockStatement ) {
+            visitProcessOutputs(node.outputs);
             fmt.appendNewLine();
         }
         if( !(node.when instanceof EmptyExpression) ) {
@@ -362,10 +360,20 @@ public void visitProcess(ProcessNode node) {
             fmt.append("stub:\n");
             fmt.visit(node.stub);
         }
+        if( options.maheshForm() && node.outputs instanceof BlockStatement ) {
+            fmt.appendNewLine();
+            visitProcessOutputs(node.outputs);
+        }
         fmt.decIndent();
         fmt.append("}\n");
     }
 
+    private void visitProcessOutputs(Statement outputs) {
+        fmt.appendIndent();
+        fmt.append("output:\n");
+        visitDirectives(outputs);
+    }
+
     @Override
     public void visitFunction(FunctionNode node) {
         fmt.appendLeadingComments(node);

modules/language-server/src/main/java/nextflow/lsp/NextflowLanguageServer.java

@@ -129,6 +129,7 @@ public static void main(String[] args) {
 
     private List<String> excludePatterns;
     private boolean harshilAlignment;
+    private boolean maheshForm;
     private boolean paranoidWarnings;
 
     // -- LanguageServer
@@ -371,7 +372,8 @@ public CompletableFuture<List<? extends TextEdit>> formatting(DocumentFormatting
             var options = new FormattingOptions(
                 params.getOptions().getTabSize(),
                 params.getOptions().isInsertSpaces(),
-                harshilAlignment
+                harshilAlignment,
+                maheshForm
             );
             log.debug(String.format("textDocument/formatting %s %s %d", relativePath(uri), options.insertSpaces() ? "spaces" : "tabs", options.tabSize()));
             var service = getLanguageService(uri);
@@ -456,6 +458,10 @@ public void didChangeConfiguration(DidChangeConfigurationParams params) {
         if( harshilAlignment != null )
             this.harshilAlignment = harshilAlignment;
 
+        var maheshForm = getJsonBoolean(params.getSettings(), "nextflow.formatting.maheshForm");
+        if( maheshForm != null )
+            this.maheshForm = maheshForm;
+    
         var paranoidWarnings = getJsonBoolean(params.getSettings(), "nextflow.paranoidWarnings");
         if( paranoidWarnings != null && this.paranoidWarnings != paranoidWarnings ) {
             this.paranoidWarnings = paranoidWarnings;

modules/language-server/src/main/java/nextflow/lsp/ast/ASTNodeStringUtils.java

@@ -94,7 +94,7 @@ private static String featureFlagToLabel(FeatureFlagNode node) {
     private static String workflowToLabel(WorkflowNode node) {
         if( node.isEntry() )
             return "workflow <entry>";
-        var fmt = new Formatter(new FormattingOptions(2, true, false));
+        var fmt = new Formatter(new FormattingOptions(2, true));
         fmt.append("workflow ");
         fmt.append(node.getName());
         fmt.append(" {\n");
@@ -134,7 +134,7 @@ private static String workflowToLabel(WorkflowNode node) {
     }
 
     private static String processToLabel(ProcessNode node) {
-        var fmt = new Formatter(new FormattingOptions(2, true, false));
+        var fmt = new Formatter(new FormattingOptions(2, true));
         fmt.append("process ");
         fmt.append(node.getName());
         fmt.append(" {\n");

modules/language-server/src/test/groovy/nextflow/lsp/services/config/ConfigFormattingTest.groovy

@@ -36,7 +36,7 @@ class ConfigFormattingTest extends Specification {
         def uri = filePath.toUri()
         def textDocumentItem = new TextDocumentItem(uri.toString(), 'nextflow-config', 1, contents)
         service.didOpen(new DidOpenTextDocumentParams(textDocumentItem))
-        def textEdits = service.formatting(uri, new FormattingOptions(4, true, false))
+        def textEdits = service.formatting(uri, new FormattingOptions(4, true))
         return textEdits.first().getNewText()
     }
 

modules/language-server/src/test/groovy/nextflow/lsp/services/script/ScriptFormattingTest.groovy

@@ -50,7 +50,7 @@ class ScriptFormattingTest extends Specification {
         def uri = filePath.toUri()
         def textDocumentItem = new TextDocumentItem(uri.toString(), 'nextflow', 1, contents)
         service.didOpen(new DidOpenTextDocumentParams(textDocumentItem))
-        def textEdits = service.formatting(uri, new FormattingOptions(4, true, false))
+        def textEdits = service.formatting(uri, new FormattingOptions(4, true))
         return textEdits.first().getNewText()
     }