Don't crash on union catch variables with modifiers

cushon · cushon · commit 6083e8aaf891 · 2016-03-18T17:16:38.000-07:00
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=117583993
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -132,6 +132,7 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -2332,6 +2333,8 @@ private void visitUnionType(SingleVariableDeclaration declaration) {
     UnionType type = (UnionType) declaration.getType();
     builder.open(ZERO);
     sync(declaration);
+    visitAndBreakModifiers(
+        declaration.modifiers(), Direction.HORIZONTAL, Optional.<BreakTag>absent());
     List<Type> union = type.types();
     boolean first = true;
     for (int i = 0; i < union.size() - 1; i++) {
@@ -2351,7 +2354,7 @@ private void visitUnionType(SingleVariableDeclaration declaration) {
     declareOne(
         declaration,
         Direction.HORIZONTAL,
-        declaration.modifiers(),
+        Collections.<IExtendedModifier>emptyList(),
         last,
         VarArgsOrNot.valueOf(declaration.isVarargs()),
         declaration.varargsAnnotations(),
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27602933.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27602933.input
@@ -0,0 +1,11 @@
+class B27602933 {
+  {
+    try {
+    } catch (final A | B x) {
+    }
+
+    try {
+    } catch (@SuppressWarnings("unused") IllegalArgumentException | RuntimeException e) {
+    }
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27602933.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B27602933.output
@@ -0,0 +1,11 @@
+class B27602933 {
+  {
+    try {
+    } catch (final A | B x) {
+    }
+
+    try {
+    } catch (@SuppressWarnings("unused") IllegalArgumentException | RuntimeException e) {
+    }
+  }
+}
