Parse dynamic method invocation (#5778)

Author: jevanlingen

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

@@ -504,8 +504,8 @@ class B {                               class B {
                 methodName = method.getName();
             } else {
                 // Method name might be in quotes
-                char openingQuote = source.charAt(cursor);
-                methodName = openingQuote + method.getName() + openingQuote;
+                String delim = source.charAt(cursor) + "";
+                methodName = sourceSubstring(cursor, delim) + delim;
             }
             cursor += methodName.length();
             J.Identifier name = new J.Identifier(randomId(),
@@ -1739,25 +1739,26 @@ public void visitMethodCallExpression(MethodCallExpression call) {
                 // So the "select" that was just parsed _may_ have actually been the method name
                 J.Identifier name;
 
-                String methodNameExpression = call.getMethodAsString();
+                String methodName = call.getMethodAsString();
+                // Check for escaped method name, often used in tests (def 'description'() {}) or to avoid clashing with Groovy keywords
                 if (source.charAt(cursor) == '"' || source.charAt(cursor) == '\'') {
-                    // we have an escaped groovy method name, commonly used for test `def 'some scenario description'() {}`
-                    // or to workaround names that are also keywords in groovy
-                    methodNameExpression = source.charAt(cursor) + methodNameExpression + source.charAt(cursor);
+                    // TODO: Methods with string interpolation are parsed as just one method name instead of multiple LST elements
+                    String delim = source.charAt(cursor) + "";
+                    methodName = sourceSubstring(cursor, delim) + delim;
                 }
 
                 Space prefix = whitespace();
-                boolean implicitCall = (methodNameExpression != null && cursor < source.length() &&
-                        source.charAt(cursor) == '(' && (cursor + methodNameExpression.length() > source.length() ||
-                        !methodNameExpression.equals(source.substring(cursor, cursor + methodNameExpression.length())))
+                boolean implicitCall = (methodName != null && cursor < source.length() &&
+                        source.charAt(cursor) == '(' && (cursor + methodName.length() > source.length() ||
+                        !methodName.equals(source.substring(cursor, cursor + methodName.length())))
                 );
                 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);
                 } else {
-                    if (methodNameExpression.equals(source.substring(cursor, cursor + methodNameExpression.length()))) {
-                        skip(methodNameExpression);
-                        name = new J.Identifier(randomId(), prefix, Markers.EMPTY, emptyList(), methodNameExpression, null, null);
+                    if (methodName.equals(source.substring(cursor, cursor + methodName.length()))) {
+                        skip(methodName);
+                        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();
                         select = null;

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

@@ -212,7 +212,7 @@ public J.ArrayType visitArrayType(J.ArrayType arrayType, Object o) {
 
     @Test
     @Issue("https://github.com/openrewrite/rewrite/issues/3559")
-    void escapedMethodNameTest() {
+    void escapedMethodName() {
         rewriteRun(
           groovy(
             """
@@ -224,7 +224,7 @@ void escapedMethodNameTest() {
     }
 
     @Test
-    void escapedMethodNameWithSpacesTest() {
+    void escapedMethodNameWithSpaces() {
         rewriteRun(
           groovy(
             """
@@ -235,6 +235,18 @@ void escapedMethodNameWithSpacesTest() {
         );
     }
 
+    @Test
+    void escapedMethodNameWithDollarSign() {
+        rewriteRun(
+          groovy(
+            """
+              def "xMethod\\${regularText}"() {}
+              "xMethod\\${regularText}"()
+              """
+          )
+        );
+    }
+
     @Issue("https://github.com/openrewrite/rewrite/issues/4705")
     @Test
     void functionWithDefAndExplicitReturnType() {

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

@@ -198,6 +198,19 @@ void useClassAsArgumentJavaStyle() {
         );
     }
 
+    @Test
+    void dynamicMethodInvocation() {
+        rewriteRun(
+          groovy(
+            """
+              def xMethod() {}
+              def prefix = "x"
+              "${prefix}Method"()
+              """
+          )
+        );
+    }
+
     @Test
     void staticMethodReference() {
         rewriteRun(
@@ -696,5 +709,4 @@ static <T> boolean compare(T t1, T t2) {
           )
         );
     }
-
 }