From c7bfba873eb62a73668875cb1e9d94fb322bec1c Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Thu, 1 May 2014 21:42:38 +0200 Subject: [java8] Support in delombok for method references. --- .../lombok/delombok/PrettyCommentsPrinter.java | 37 +++++++++++++++-- test/pretty/resource/after/MethodReference.java | 36 ++++++++++++++++ test/pretty/resource/before/MethodReference.java | 48 ++++++++++++++++++++++ 3 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 test/pretty/resource/after/MethodReference.java create mode 100644 test/pretty/resource/before/MethodReference.java 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 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 readTreeList(JCTree tree, String fieldName) throws IOException { try { - return (List) readObject(tree, fieldName); + return (List) readObject0(tree, fieldName); } catch (Exception e) { return List.nil(); } @@ -1630,14 +1651,22 @@ public class PrettyCommentsPrinter extends JCTree.Visitor { @SuppressWarnings("unchecked") private List readExpressionList(JCTree tree, String fieldName) throws IOException { try { - return (List) readObject(tree, fieldName); + return (List) 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 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::generifiedStaticFoo; + } + public void generifiedConstructorReference() { + FooConverter fc = MethodReference::new; + } + public void foo() { + } + private static void staticFoo() { + } + public static T generifiedStaticFoo(T foo) { + return foo; + } + @FunctionalInterface + public interface StringConverter { + String hello(String x); + } + @FunctionalInterface + public interface FooConverter { + 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 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::generifiedStaticFoo; + } + + public void generifiedConstructorReference() { + FooConverter fc = MethodReference::new; + } + + public void foo() { + } + + private static void staticFoo() { + } + + public static T generifiedStaticFoo(T foo) { + return foo; + } + + @FunctionalInterface + public interface StringConverter { + public String hello(String x); + } + + @FunctionalInterface + public interface FooConverter { + public K hello(String x); + } +} -- cgit