Groovy: fix parsing of command expressions with args in parens (#7503)

Author: greg-at-moderne

rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java

@@ -2186,6 +2186,7 @@ public void visitMethodCallExpression(MethodCallExpression call) {
                         source.charAt(cursor) == '(' && (cursor + methodName.length() > source.length() ||
                         !methodName.equals(source.substring(cursor, cursor + methodName.length())))
                 );
+                Space spaceBeforeArgs = null;
                 if (implicitCall) {
                     // This is an implicit call() method - create identifier but it doesn't get printed
                     name = new J.Identifier(randomId(), prefix, Markers.EMPTY, emptyList(), "", null, null);
@@ -2195,6 +2196,10 @@ public void visitMethodCallExpression(MethodCallExpression call) {
                         name = new J.Identifier(randomId(), prefix, Markers.EMPTY, emptyList(), methodName, null, null);
                     } else if (select != null && select.getElement() instanceof J.Identifier) {
                         name = (J.Identifier) select.getElement();
+                        // Closure-style command expression like `x foo(c)` parses as `x.call(foo(c))`.
+                        // The whitespace captured as select's right-padding is the space between
+                        // the closure name and its argument list, which has no parens.
+                        spaceBeforeArgs = select.getAfter();
                         select = null;
                     } else {
                         throw new IllegalArgumentException("Unable to parse method call");
@@ -2239,6 +2244,9 @@ public void visitMethodCallExpression(MethodCallExpression call) {
                     markers = handlesCaseWhereEmptyParensAheadOfClosure(args, markers);
                 }
                 JContainer<Expression> args = doVisit(call.getArguments());
+                if (spaceBeforeArgs != null && !spaceBeforeArgs.getWhitespace().isEmpty()) {
+                    args = args.withBefore(spaceBeforeArgs);
+                }
 
                 MethodNode methodNode = (MethodNode) call.getNodeMetaData().get(StaticTypesMarker.DIRECT_METHOD_CALL_TARGET);
                 JavaType.Method methodType = null;

rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodInvocationTest.java

@@ -771,4 +771,16 @@ void methodNameStartingWithClassKeyword() {
           )
         );
     }
+
+    @Test
+    void commandExpressionWithParenthesizedArgument() {
+        rewriteRun(
+          groovy(
+            """
+              def x
+              x foo(c)
+              """
+          )
+        );
+    }
 }