[java8] Support in delombok for method references.

3 files changed, 117 insertions, 4 deletions

diff --git a/src/delombok/lombok/delombok/PrettyCommentsPrinter.java b/src/delombok/lombok/delombok/PrettyCommentsPrinter.java
index 36413332..79f22e58 100644
--- a/src/delombok/lombok/delombok/PrettyCommentsPrinter.java
+++ b/src/delombok/lombok/delombok/PrettyCommentsPrinter.java
@@ -1575,6 +1575,9 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
 			} else if ("JCLambda".equals(simpleName)) {
 				visitLambda0(tree);
 				return;
+			} else if ("JCMemberReference".equals(simpleName)) {
+				visitReference0(tree);
+				return;
 			} else {
 				print("(UNKNOWN[" + tree.getClass().getSimpleName() + "]: " + tree + ")");
 				println();
@@ -1610,9 +1613,27 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
 		}
 	}
 	
+
+	public void visitReference0(JCTree tree) {
+		try {
+			printExpr(readTree(tree, "expr"));
+			print("::");
+			List<JCExpression> typeArgs = readExpressionList(tree, "typeargs");
+			if (typeArgs != null) {
+				print("<");
+				printExprs(typeArgs);
+				print(">");
+			}
+			;
+			print(readObject(tree, "mode").toString().equals("INVOKE") ? readObject(tree, "name") : "new");
+		} catch (IOException e) {
+			throw new UncheckedIOException(e);
+		}
+	}
+	
 	private JCTree readTree(JCTree tree, String fieldName) {
 		try {
-			return (JCTree) readObject(tree, fieldName);
+			return (JCTree) readObject0(tree, fieldName);
 		} catch (Exception e) {
 			return null;
 		}
@@ -1621,7 +1642,7 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
 	@SuppressWarnings("unchecked")
 	private List<? extends JCTree> readTreeList(JCTree tree, String fieldName) throws IOException {
 		try {
-			return (List<? extends JCTree>) readObject(tree, fieldName);
+			return (List<? extends JCTree>) readObject0(tree, fieldName);
 		} catch (Exception e) {
 			return List.nil();
 		}
@@ -1630,14 +1651,22 @@ public class PrettyCommentsPrinter extends JCTree.Visitor {
 	@SuppressWarnings("unchecked")
 	private List<JCExpression> readExpressionList(JCTree tree, String fieldName) throws IOException {
 		try {
-			return (List<JCExpression>) readObject(tree, fieldName);
+			return (List<JCExpression>) readObject0(tree, fieldName);
 		} catch (Exception e) {
 			return List.nil();
 		}
 	}
 	
+	private Object readObject(JCTree tree, String fieldName) {
+		try {
+			return readObject0(tree, fieldName);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+	
 	@SuppressWarnings("unchecked")
-	private Object readObject(JCTree tree, String fieldName) throws Exception {
+	private Object readObject0(JCTree tree, String fieldName) throws Exception {
 		try {
 			return tree.getClass().getDeclaredField(fieldName).get(tree);
 		} catch (Exception e) {
diff --git a/test/pretty/resource/after/MethodReference.java b/test/pretty/resource/after/MethodReference.java
new file mode 100644
index 00000000..115b7014
--- /dev/null
+++ b/test/pretty/resource/after/MethodReference.java
@@ -0,0 +1,36 @@
+class MethodReference {
+	public MethodReference() {
+	}
+	public <T> MethodReference(T in) {
+	}
+	public void simpleInstanceReference() {
+		Runnable r = this::foo;
+	}
+	public void simpleConstructorReference() {
+		Runnable r = MethodReference::new;
+	}
+	public void simpleStaticReference() {
+		Runnable r = MethodReference::staticFoo;
+	}
+	public void generifiedStaticReference() {
+		StringConverter sc = MethodReference::<String>generifiedStaticFoo;
+	}
+	public void generifiedConstructorReference() {
+		FooConverter<MethodReference> fc = MethodReference::<String>new;
+	}
+	public void foo() {
+	}
+	private static void staticFoo() {
+	}
+	public static <T> T generifiedStaticFoo(T foo) {
+		return foo;
+	}
+	@FunctionalInterface
+	public interface StringConverter {
+		String hello(String x);
+	}
+	@FunctionalInterface
+	public interface FooConverter<K> {
+		K hello(String x);
+	}
+}
\ No newline at end of file
diff --git a/test/pretty/resource/before/MethodReference.java b/test/pretty/resource/before/MethodReference.java
new file mode 100644
index 00000000..c7af9bf3
--- /dev/null
+++ b/test/pretty/resource/before/MethodReference.java
@@ -0,0 +1,48 @@
+// version 8:
+class MethodReference {
+	public MethodReference() {
+	}
+	
+	public <T> MethodReference(T in) {
+	}
+	
+	public void simpleInstanceReference() {
+		Runnable r = this::foo;
+	}
+	
+	public void simpleConstructorReference() {
+		Runnable r = MethodReference::new;
+	}
+	
+	public void simpleStaticReference() {
+		Runnable r = MethodReference::staticFoo;
+	}
+	
+	public void generifiedStaticReference() {
+		StringConverter sc = MethodReference::<String>generifiedStaticFoo;
+	}
+	
+	public void generifiedConstructorReference() {
+		FooConverter<MethodReference> fc = MethodReference::<String>new;
+	}
+	
+	public void foo() {
+	}
+	
+	private static void staticFoo() {
+	}
+	
+	public static <T> T generifiedStaticFoo(T foo) {
+		return foo;
+	}
+	
+	@FunctionalInterface
+	public interface StringConverter {
+		public String hello(String x);
+	}
+	
+	@FunctionalInterface
+	public interface FooConverter<K> {
+		public K hello(String x);
+	}
+}