Fix bug with formatting closure with labels

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

Author: bentsherman

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

@@ -187,17 +187,21 @@ public void visitExpressionStatement(ExpressionStatement node) {
         currentRootExpr = node.getExpression();
         appendLeadingComments(node);
         appendIndent();
-        if( node.getStatementLabels() != null ) {
-            for( var label : node.getStatementLabels() ) {
-                append(label);
-                append(": ");
-            }
-        }
+        visitStatementLabels(node);
         visit(node.getExpression());
         appendNewLine();
         currentRootExpr = cre;
     }
 
+    private void visitStatementLabels(ExpressionStatement node) {
+        if( node.getStatementLabels() == null )
+            return;
+        for( var label : DefaultGroovyMethods.asReversed(node.getStatementLabels()) ) {
+            append(label);
+            append(": ");
+        }
+    }
+
     @Override
     public void visitReturnStatement(ReturnStatement node) {
         var cre = currentRootExpr;
@@ -280,11 +284,14 @@ public void visitMethodCallExpression(MethodCallExpression node) {
             inWrappedMethodChain = true;
 
         if( !node.isImplicitThis() ) {
-            visit(node.getObjectExpression());
+            var receiver = node.getObjectExpression();
+            visit(receiver);
             if( inWrappedMethodChain ) {
-                appendNewLine();
                 incIndent();
-                appendIndent();
+                if( !(receiver instanceof ClassExpression) ) {
+                    appendNewLine();
+                    appendIndent();
+                }
             }
             if( node.isSpreadSafe() )
                 append('*');
@@ -470,6 +477,7 @@ public void visitClosureExpression(ClosureExpression node) {
         }
         else if( code.getStatements().size() == 1 && code.getStatements().get(0) instanceof ExpressionStatement es && !shouldWrapExpression(node) ) {
             append(' ');
+            visitStatementLabels(es);
             visit(es.getExpression());
             append(" }");
         }