fix test fieldReferenceWithTypeParameter

openrewrite · Oct 27, 2023 · 7d18400 · 7d18400
1 parent 80f1664
commit 7d18400
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java b/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java
@@ -1877,17 +1877,7 @@ public J visitCallExpression(KtCallExpression expression, ExecutionContext data)
             );
         } else if (type == null || type == PsiElementAssociations.ExpressionType.METHOD_INVOCATION) {
             J.Identifier name = (J.Identifier) expression.getCalleeExpression().accept(this, data);
-            JContainer<Expression> typeParams = null;
-
-            if (!expression.getTypeArguments().isEmpty()) {
-                List<JRightPadded<Expression>> parameters = new ArrayList<>(expression.getTypeArguments().size());
-                for (KtTypeProjection ktTypeProjection : expression.getTypeArguments()) {
-                    parameters.add(padRight(convertToExpression(ktTypeProjection.accept(this, data)), suffix(ktTypeProjection)));
-                }
-
-                typeParams = JContainer.build(prefix(expression.getTypeArgumentList()), parameters, Markers.EMPTY);
-            }
-
+            JContainer<Expression> typeParams = mapTypeArguments(expression.getTypeArgumentList(), data);
             JContainer<Expression> args = mapFunctionCallArguments(expression.getValueArgumentList(), expression.getValueArguments(), data);
 
             if (expression.getValueArgumentList() == null) {
@@ -1906,12 +1896,37 @@ public J visitCallExpression(KtCallExpression expression, ExecutionContext data)
                     methodType
             );
         } else if (type == PsiElementAssociations.ExpressionType.QUALIFIER) {
-            throw new UnsupportedOperationException("Implement name references.");
+            TypeTree typeTree = (TypeTree) expression.getCalleeExpression().accept(this, data);
+            JContainer<Expression> typeParams = mapTypeArguments(expression.getTypeArgumentList(), data);
+
+            return new J.ParameterizedType(
+                    randomId(),
+                    prefix(expression),
+                    Markers.EMPTY,
+                    typeTree,
+                    typeParams,
+                    type(expression)
+            );
         } else {
             throw new UnsupportedOperationException("ExpressionType not found: " + expression.getCalleeExpression().getText());
         }
     }
 
+    @Nullable
+    JContainer<Expression> mapTypeArguments(@Nullable KtTypeArgumentList ktTypeArgumentList, ExecutionContext data) {
+        if (ktTypeArgumentList == null) {
+            return null;
+        }
+
+        List<KtTypeProjection> ktTypeProjections = ktTypeArgumentList.getArguments();
+        List<JRightPadded<Expression>> parameters = new ArrayList<>(ktTypeProjections.size());
+        for (KtTypeProjection ktTypeProjection : ktTypeProjections) {
+            parameters.add(padRight(convertToExpression(ktTypeProjection.accept(this, data)), suffix(ktTypeProjection)));
+        }
+
+        return JContainer.build(prefix(ktTypeArgumentList), parameters, Markers.EMPTY);
+    }
+
     @Override
     public J visitConstantExpression(KtConstantExpression expression, ExecutionContext data) {
         IElementType elementType = expression.getElementType();

diff --git a/src/test/java/org/openrewrite/kotlin/tree/MethodReferenceTest.java b/src/test/java/org/openrewrite/kotlin/tree/MethodReferenceTest.java
@@ -46,7 +46,7 @@ void fieldReferenceWithTypeParameter() {
               class Test < T: Number > ( val answer : T )
               fun method ( ) {
                   val l = listOf ( Test ( 42 ) )
-                  l . map { Test < Int > :: answer }
+                  l . map {  Test <  Int   > :: answer }
               }
               """
           )