Fix for constructor member references

Netflix-Skunkworks · Feb 3, 2017 · 229ca03 · 229ca03
1 parent 78b54bb
commit 229ca03
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/rewrite-core/src/main/kotlin/com/netflix/rewrite/parse/OracleJdkParserVisitor.kt b/rewrite-core/src/main/kotlin/com/netflix/rewrite/parse/OracleJdkParserVisitor.kt
@@ -518,12 +518,14 @@ class OracleJdkParserVisitor(val path: Path, val source: String): TreePathScanne
     }
 
     override fun visitMemberReference(node: MemberReferenceTree, fmt: Formatting.Reified): Tree {
-        return Tr.MemberReference(
-                (node as JCTree.JCMemberReference).expr.convert { sourceBefore("::") },
-                Tr.Ident.build(node.name.toString(), null, format(sourceBefore(node.name.toString()))),
-                node.type(),
-                fmt
-        )
+        val expr = (node as JCTree.JCMemberReference).expr.convert<Expression> { sourceBefore("::") }
+        val referenceName = when(node.mode!!) {
+            MemberReferenceTree.ReferenceMode.NEW -> "new"
+            MemberReferenceTree.ReferenceMode.INVOKE -> node.name.toString()
+        }
+        val reference = Tr.Ident.build(referenceName, null, format(sourceBefore(referenceName)))
+
+        return Tr.MemberReference(expr, reference, node.type(), fmt)
     }
 
     override fun visitMemberSelect(node: MemberSelectTree, fmt: Formatting.Reified): Tree {

diff --git a/rewrite-core/src/test/kotlin/com/netflix/rewrite/ast/MemberReferenceTest.kt b/rewrite-core/src/test/kotlin/com/netflix/rewrite/ast/MemberReferenceTest.kt
@@ -37,4 +37,19 @@ abstract class MemberReferenceTest(p: Parser): Parser by p {
 
         assertEquals(0L, memberRefLatch.count)
     }
+
+    @Test
+    fun constructorMethodReference() {
+        val a = parse("""
+            import java.util.*;
+            import java.util.stream.*;
+            public class A {
+                Stream<Integer> n = Stream.of(1, 2);
+                Set<Integer> n2 = n.collect(HashSet<Integer>::new, HashSet::add);
+            }
+        """)
+
+        val collect = a.classes[0].fields()[1].vars[0].initializer!!
+        assertEquals("n.collect(HashSet<Integer>::new, HashSet::add)", collect.printTrimmed())
+    }
 }