Fix a crash in instanceof pattern handling

Fixes https://github.com/google/google-java-format PiperOrigin-RevId: 368720966
google · Apr 15, 2021 · 32b63aa · 32b63aa
1 parent 5104d0b
commit 32b63aa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
@@ -60,7 +60,7 @@ public Void visitBindingPattern(BindingPatternTree node, Void unused) {
     } catch (ReflectiveOperationException e1) {
       try {
         Tree type = (Tree) BindingPatternTree.class.getMethod("getType").invoke(node);
-        Name name = (Name) BindingPatternTree.class.getMethod("getName").invoke(node);
+        Name name = (Name) BindingPatternTree.class.getMethod("getBinding").invoke(node);
         visitBindingPattern(/* modifiers= */ null, type, name);
       } catch (ReflectiveOperationException e2) {
         e2.addSuppressed(e1);

diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
@@ -48,7 +48,7 @@
 public class FormatterIntegrationTest {
 
   private static final ImmutableSet<String> JAVA14_TESTS =
-      ImmutableSet.of("I477", "Records", "RSLs", "Var", "ExpressionSwitch", "I574");
+      ImmutableSet.of("I477", "Records", "RSLs", "Var", "ExpressionSwitch", "I574", "I594");
 
   private static final ImmutableSet<String> JAVA16_TESTS = ImmutableSet.of("I588");
 

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.input
@@ -0,0 +1,7 @@
+public class I594 {
+  public void thisIsNotFormattedCorrectly(Object something){
+    if(something instanceof String somethingAsString){
+      return;
+    }
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I594.output
@@ -0,0 +1,7 @@
+public class I594 {
+  public void thisIsNotFormattedCorrectly(Object something) {
+    if (something instanceof String somethingAsString) {
+      return;
+    }
+  }
+}