Set types on method invocation names to the same type the compiler ge…

…nerates. (#365)
openrewrite · Dec 7, 2023 · 513b6fa · 513b6fa
1 parent f399d72
commit 513b6fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/org/openrewrite/java/migrate/ChangeMethodInvocationReturnType.java b/src/main/java/org/openrewrite/java/migrate/ChangeMethodInvocationReturnType.java
@@ -69,6 +69,9 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 if (methodMatcher.matches(method) && type != null && !newReturnType.equals(type.getReturnType().toString())) {
                     type = type.withReturnType(JavaType.buildType(newReturnType));
                     m = m.withMethodType(type);
+                    if (m.getName().getType() != null) {
+                        m = m.withName(m.getName().withType(type));
+                    }
                     methodUpdated = true;
                 }
                 return m;

diff --git a/src/main/java/org/openrewrite/java/migrate/lang/StringFormatted.java b/src/main/java/org/openrewrite/java/migrate/lang/StringFormatted.java
@@ -63,6 +63,9 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
             Optional<JavaType.Method> formatted = method.getMethodType().getDeclaringType().getMethods().stream()
                 .filter(m -> m.getName().equals("formatted")).findAny();
             mi = mi.withMethodType(formatted.orElse(null));
+            if (mi.getName().getType() != null) {
+                mi = mi.withName(mi.getName().withType(mi.getMethodType()));
+            }
             Expression select = wrapperNotNeeded ? arguments.get(0) :
                 new J.Parentheses<>(Tree.randomId(), Space.EMPTY, Markers.EMPTY, JRightPadded.build(arguments.get(0)));
             mi = mi.withSelect(select);