Merge pull request #66 from openjavaformat/member-reference-type-annotation

Accept a type annotation on the qualifier of a method reference

Author: abashev

open-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java

@@ -928,7 +928,8 @@ public boolean visitEnumDeclaration(ClassTree node) {
 
     @Override
     public Void visitMemberReference(MemberReferenceTree node, Void unused) {
-        sync(node);
+        // No sync(node): javac's start position for a member reference leaves out a type annotation on its
+        // qualifier ("@A ArrayList::new"), so syncing to it would report the annotation as never generated.
         builder.open(OpenOp.builder()
                 .plusIndent(plusFour)
                 .debugName("methodReference")

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/B308157568.input

@@ -0,0 +1,23 @@
+class C {
+  @A(0x14)
+  int f(Object o) {
+    @A(0x40)
+    int local;
+    try (@A(0x41)
+        JarFile jarFile = new JarFile("hello.jar")) {
+    } catch (
+        @A(0x42)
+        IOException e) {
+    }
+    if (o instanceof @A(0x43) String) {}
+    new @A(0x44) ArrayList<>();
+    Supplier<List<?>> a = @A(0x45) ArrayList::new;
+    Supplier<List<?>> b = @A(0x46) ImmutableList::of;
+    String s = (@A(0x47) String) o;
+    List<?> xs = new ArrayList<@A(0x48) String>();
+    xs = ImmutableList.<@A(0x49) String>of();
+    Supplier<List<?>> c = ArrayList<@A(0x4A) String>::new;
+    Supplier<List<?>> d = ImmutableList::<@A(0x4B) String>of;
+    return 0;
+  }
+}

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/B308157568.output

@@ -0,0 +1,23 @@
+class C {
+    @A(0x14)
+    int f(Object o) {
+        @A(0x40)
+        int local;
+        try (@A(0x41)
+                JarFile jarFile = new JarFile("hello.jar")) {
+        } catch (
+                @A(0x42)
+                IOException e) {
+        }
+        if (o instanceof @A(0x43) String) {}
+        new @A(0x44) ArrayList<>();
+        Supplier<List<?>> a = @A(0x45) ArrayList::new;
+        Supplier<List<?>> b = @A(0x46) ImmutableList::of;
+        String s = (@A(0x47) String) o;
+        List<?> xs = new ArrayList<@A(0x48) String>();
+        xs = ImmutableList.<@A(0x49) String>of();
+        Supplier<List<?>> c = ArrayList<@A(0x4A) String>::new;
+        Supplier<List<?>> d = ImmutableList::<@A(0x4B) String>of;
+        return 0;
+    }
+}