Improve handling of union types

* don't break after `} catch (` * unify breaks between union type elements * associate the identifier with the last union type element ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=115271047
google · Feb 23, 2016 · bccce1a · bccce1a
1 parent 5ddd761
commit bccce1a
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 24 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -2340,17 +2340,62 @@ private void visitCatchClause(CatchClause node, AllowTrailingBlankLine allowTrai
     builder.space();
     token("(");
     builder.open(plusFour);
-    builder.breakOp();
-    builder.open(ZERO);
-    visit(node.getException());
-    builder.close();
+    SingleVariableDeclaration ex = node.getException();
+    if (ex.getType().getNodeType() == ASTNode.UNION_TYPE) {
+      builder.open(ZERO);
+      visitUnionType(ex);
+      builder.close();
+    } else {
+      builder.breakToFill();
+      builder.open(ZERO);
+      visit(ex);
+      builder.close();
+    }
     builder.close();
     token(")");
     builder.space();
     visitBlock(
         node.getBody(), CollapseEmptyOrNot.NO, AllowLeadingBlankLine.YES, allowTrailingBlankLine);
   }
 
+  /** Formats a union type declaration in a catch clause. */
+  private void visitUnionType(SingleVariableDeclaration declaration) {
+    UnionType type = (UnionType) declaration.getType();
+    builder.open(ZERO);
+    sync(declaration);
+    List<Type> union = type.types();
+    boolean first = true;
+    for (int i = 0; i < union.size() - 1; i++) {
+      if (!first) {
+        builder.breakOp(" ");
+        token("|");
+        builder.space();
+      } else {
+        first = false;
+      }
+      union.get(i).accept(this);
+    }
+    builder.breakOp(" ");
+    token("|");
+    builder.space();
+    Type last = union.get(union.size() - 1);
+    declareOne(
+        declaration,
+        Direction.HORIZONTAL,
+        declaration.modifiers(),
+        last,
+        VarArgsOrNot.valueOf(declaration.isVarargs()),
+        declaration.varargsAnnotations(),
+        declaration.getName(),
+        "",
+        declaration.extraDimensions(),
+        "=",
+        Optional.fromNullable(declaration.getInitializer()),
+        Optional.<String>absent(),
+        ReceiverParameter.NO);
+    builder.close();
+  }
+
   /**
    * Helper method for {@link InfixExpression}s. Visit this {@link Expression} node, and its
    * children, as long as they are {@link InfixExpression} nodes of the same precedence. Accumulate

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B22169269.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B22169269.input
@@ -2,10 +2,13 @@ class B22169269 {
   {
     try {
     } catch (
-        ClassNotFoundException 
-        | NoSuchMethodException 
+        ClassNotFoundException
+        | NoSuchMethodException
         | InvocationTargetException
         | IllegalAccessException e) {
     }
+    try {
+    } catch (ClassNotFoundException | NoSuchMethodException e) {
+    }
   }
 }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B22169269.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B22169269.output
@@ -1,12 +1,13 @@
 class B22169269 {
   {
     try {
-    } catch (
-        ClassNotFoundException
-                | NoSuchMethodException
-                | InvocationTargetException
-                | IllegalAccessException
-            e) {
+    } catch (ClassNotFoundException
+        | NoSuchMethodException
+        | InvocationTargetException
+        | IllegalAccessException e) {
+    }
+    try {
+    } catch (ClassNotFoundException | NoSuchMethodException e) {
     }
   }
 }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/U.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/U.output
@@ -38,18 +38,16 @@ class U {
         default:
           throw new Exception9();
       }
-    } catch (
-        Exception0
-                | Exception1
-                | Exception2
-                | Exception3
-                | Exception4
-                | Exception5
-                | Exception6
-                | Exception7
-                | Exception8
-                | Exception9
-            e) {
+    } catch (Exception0
+        | Exception1
+        | Exception2
+        | Exception3
+        | Exception4
+        | Exception5
+        | Exception6
+        | Exception7
+        | Exception8
+        | Exception9 e) {
     }
   }
 }