Fix 376

openrewrite · Nov 10, 2023 · 4fb2f02 · 4fb2f02 · kunli2 · Nov 10, 2023
1 parent 4f67c21
commit 4fb2f02
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java b/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java
@@ -2278,9 +2278,29 @@ public J visitDotQualifiedExpression(KtDotQualifiedExpression expression, Execut
         assert expression.getSelectorExpression() != null;
         if (expression.getSelectorExpression() instanceof KtCallExpression) {
             KtCallExpression callExpression = (KtCallExpression) expression.getSelectorExpression();
+            J j = callExpression.accept(this, data);
+            Expression receiver = convertToExpression(expression.getReceiverExpression().accept(this, data));
+
+            if (j instanceof J.ParameterizedType) {
+                J.ParameterizedType pt = (J.ParameterizedType) j;
+                if (pt != null) {
+                    pt = pt.withClazz(pt.getClazz().withPrefix(prefix(callExpression)));
+                    J.FieldAccess newName = new J.FieldAccess(
+                            randomId(),
+                            receiver.getPrefix(),
+                            Markers.EMPTY,
+                            receiver.withPrefix(Space.EMPTY),
+                            padLeft(suffix(expression.getReceiverExpression()), (J.Identifier) pt.getClazz()),
+                            pt.getType()
+                    );
+                    pt = pt.withClazz(newName);
+                }
+
+                return pt;
+            }
+
             MethodCall methodInvocation = (MethodCall) callExpression.accept(this, data);
 
-            Expression receiver = convertToExpression(expression.getReceiverExpression().accept(this, data));
             if (methodInvocation instanceof J.MethodInvocation) {
                 methodInvocation = ((J.MethodInvocation) methodInvocation).getPadding().withSelect(padRight(receiver, suffix(expression.getReceiverExpression())))
                         .withName(((J.MethodInvocation) methodInvocation).getName().withPrefix(prefix(callExpression)))

diff --git a/src/test/java/org/openrewrite/kotlin/tree/MethodReferenceTest.java b/src/test/java/org/openrewrite/kotlin/tree/MethodReferenceTest.java
@@ -112,4 +112,17 @@ void anonymousClassArgument() {
           )
         );
     }
+
+    @Issue("https://github.com/openrewrite/rewrite-kotlin/issues/376")
+    @Test
+    void memberReferenceWithParameterizedType() {
+        rewriteRun(
+          kotlin(
+            """
+              val x: MutableMap<String, String> = hashMapOf()
+              val keys = x.entries.map(MutableMap.MutableEntry<String, String>::key)
+              """
+          )
+        );
+    }
 }