Handle type annotations on method reference qualifiers

cushon · google-java-format Team · commit 53390d99b56e · 2023-10-30T08:22:49.000-07:00
e.g. ``` Supplier<List<?>> a = @A(0x45) ArrayList::new; Supplier<List<?>> b = @A(0x46) ImmutableList::of; ``` The necessary logic is already there, but the start position information for the method reference doesn't include the leading type annotations, which was resulting in an assertion to fail. PiperOrigin-RevId: 577850593
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -930,7 +930,6 @@ public boolean visitEnumDeclaration(ClassTree node) {
 
   @Override
   public Void visitMemberReference(MemberReferenceTree node, Void unused) {
-    sync(node);
     builder.open(plusFour);
     scan(node.getQualifierExpression(), null);
     builder.breakOp();
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B308157568.input b/core/src/test/resources/com/google/googlejavaformat/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;
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B308157568.output b/core/src/test/resources/com/google/googlejavaformat/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;
+  }
+}
