Use type patterns more widely.

No functional change is intended.

PiperOrigin-RevId: 890952666

Author: eamonnmcmanus

core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java

@@ -1273,9 +1273,11 @@ private void checkForTypeAnnotation(ImportTree node) {
   }
 
   private static Name getSimpleName(ImportTree importTree) {
-    return importTree.getQualifiedIdentifier() instanceof IdentifierTree
-        ? ((IdentifierTree) importTree.getQualifiedIdentifier()).getName()
-        : ((MemberSelectTree) importTree.getQualifiedIdentifier()).getIdentifier();
+    return switch (importTree.getQualifiedIdentifier()) {
+      case IdentifierTree identifierTree -> identifierTree.getName();
+      case MemberSelectTree memberSelectTree -> memberSelectTree.getIdentifier();
+      case Tree tree -> throw new AssertionError(tree);
+    };
   }
 
   @Override
@@ -1383,14 +1385,14 @@ public Void visitLambdaExpression(LambdaExpressionTree node, Void unused) {
     } else {
       builder.breakOp(" ");
     }
-    if (node.getBody().getKind() == Tree.Kind.BLOCK) {
-      visitBlock(
-          (BlockTree) node.getBody(),
-          CollapseEmptyOrNot.YES,
-          AllowLeadingBlankLine.NO,
-          AllowTrailingBlankLine.NO);
-    } else {
-      scan(node.getBody(), null);
+    switch (node.getBody()) {
+      case BlockTree blockTree ->
+          visitBlock(
+              blockTree,
+              CollapseEmptyOrNot.YES,
+              AllowLeadingBlankLine.NO,
+              AllowTrailingBlankLine.NO);
+      case Tree expressionTree -> scan(expressionTree, null);
     }
     builder.close();
     return null;
@@ -1473,20 +1475,20 @@ public void visitAnnotationArgument(AssignmentTree node) {
   @Override
   public Void visitAnnotatedType(AnnotatedTypeTree node, Void unused) {
     sync(node);
-    ExpressionTree base = node.getUnderlyingType();
-    if (base instanceof MemberSelectTree selectTree) {
-
-      scan(selectTree.getExpression(), null);
-      token(".");
-      visitAnnotations(node.getAnnotations(), BreakOrNot.NO, BreakOrNot.NO);
-      builder.breakToFill(" ");
-      visit(selectTree.getIdentifier());
-    } else if (base instanceof ArrayTypeTree) {
-      visitAnnotatedArrayType(node);
-    } else {
-      visitAnnotations(node.getAnnotations(), BreakOrNot.NO, BreakOrNot.NO);
-      builder.breakToFill(" ");
-      scan(base, null);
+    switch (node.getUnderlyingType()) {
+      case MemberSelectTree selectTree -> {
+        scan(selectTree.getExpression(), null);
+        token(".");
+        visitAnnotations(node.getAnnotations(), BreakOrNot.NO, BreakOrNot.NO);
+        builder.breakToFill(" ");
+        visit(selectTree.getIdentifier());
+      }
+      case ArrayTypeTree arrayTypeTree -> visitAnnotatedArrayType(node);
+      case ExpressionTree base -> {
+        visitAnnotations(node.getAnnotations(), BreakOrNot.NO, BreakOrNot.NO);
+        builder.breakToFill(" ");
+        scan(base, null);
+      }
     }
     return null;
   }
@@ -1717,8 +1719,7 @@ private boolean handleLogStatement(MethodInvocationTree node) {
     }
     Deque<ExpressionTree> parts = new ArrayDeque<>();
     ExpressionTree curr = node;
-    while (curr instanceof MethodInvocationTree) {
-      MethodInvocationTree method = (MethodInvocationTree) curr;
+    while (curr instanceof MethodInvocationTree method) {
       parts.addFirst(method);
       if (!LOG_METHODS.contains(getMethodName(method).toString())) {
         return false;
@@ -1913,14 +1914,13 @@ private boolean ambiguousUnaryOperator(UnaryTree node, String operatorName) {
   }
 
   private JCTree.Tag unaryTag(ExpressionTree expression) {
-    if (expression instanceof UnaryTree) {
-      return ((JCTree) expression).getTag();
-    }
-    if (expression instanceof LiteralTree
-        && isUnaryMinusLiteral(getSourceForNode(expression, getCurrentPath()))) {
-      return JCTree.Tag.MINUS;
-    }
-    return null;
+    return switch (expression) {
+      case UnaryTree unary -> ((JCTree) expression).getTag();
+      case LiteralTree literal
+          when isUnaryMinusLiteral(getSourceForNode(literal, getCurrentPath())) ->
+          JCTree.Tag.MINUS;
+      default -> null;
+    };
   }
 
   @Override
@@ -2642,10 +2642,11 @@ private void formatAnnotationOrModifier(Deque<AnnotationOrModifier> modifiers) {
 
   boolean isTypeAnnotation(AnnotationTree annotationTree) {
     Tree annotationType = annotationTree.getAnnotationType();
-    if (!(annotationType instanceof IdentifierTree identifierTree)) {
-      return false;
-    }
-    return typeAnnotationSimpleNames.contains(identifierTree.getName());
+    return switch (annotationType) {
+      case IdentifierTree identifierTree ->
+          typeAnnotationSimpleNames.contains(identifierTree.getName());
+      default -> false;
+    };
   }
 
   private static boolean isModifier(String token) {
@@ -2943,8 +2944,9 @@ public Void visitUses(UsesTree node, Void unused) {
   /** Helper method for import declarations, names, and qualified names. */
   private void visitName(Tree node) {
     Deque<Name> stack = new ArrayDeque<>();
-    for (; node instanceof MemberSelectTree; node = ((MemberSelectTree) node).getExpression()) {
-      stack.addFirst(((MemberSelectTree) node).getIdentifier());
+    while (node instanceof MemberSelectTree memberSelectTree) {
+      stack.addFirst(memberSelectTree.getIdentifier());
+      node = memberSelectTree.getExpression();
     }
     stack.addFirst(((IdentifierTree) node).getName());
     boolean afterFirstToken = false;
@@ -3114,8 +3116,8 @@ void visitDot(ExpressionTree node0) {
       prefixes.add(firstInvocationIndex);
     }
 
-    if (prefixes.isEmpty() && items.get(0) instanceof IdentifierTree) {
-      switch (((IdentifierTree) items.get(0)).getName().toString()) {
+    if (prefixes.isEmpty() && items.get(0) instanceof IdentifierTree identifierTree) {
+      switch (identifierTree.getName().toString()) {
         case "this", "super" -> prefixes.add(1);
         default -> {}
       }
@@ -3315,12 +3317,12 @@ private void dotExpressionUpToArgs(ExpressionTree expression, Optional<BreakTag>
   }
 
   /**
-   * Returns the base expression of an erray access, e.g. given {@code foo[0][0]} returns {@code
+   * Returns the base expression of an array access, e.g. given {@code foo[0][0]} returns {@code
    * foo}.
    */
   private static ExpressionTree getArrayBase(ExpressionTree node) {
-    while (node instanceof ArrayAccessTree) {
-      node = ((ArrayAccessTree) node).getExpression();
+    while (node instanceof ArrayAccessTree arrayAccessTree) {
+      node = arrayAccessTree.getExpression();
     }
     return node;
   }
@@ -3369,8 +3371,7 @@ private void formatArrayIndices(Deque<ExpressionTree> indices) {
    */
   private static Deque<ExpressionTree> getArrayIndices(ExpressionTree expression) {
     Deque<ExpressionTree> indices = new ArrayDeque<>();
-    while (expression instanceof ArrayAccessTree) {
-      ArrayAccessTree array = (ArrayAccessTree) expression;
+    while (expression instanceof ArrayAccessTree array) {
       indices.addLast(array.getIndex());
       expression = array.getExpression();
     }
@@ -3507,7 +3508,7 @@ public void scan(JCTree tree) {
         }
         if (tree.getKind() == STRING_LITERAL) {
           Object value = ((LiteralTree) tree).getValue();
-          if (value instanceof String && FORMAT_SPECIFIER.matcher(value.toString()).find()) {
+          if (value instanceof String string && FORMAT_SPECIFIER.matcher(string).find()) {
             formatString[0] = true;
           }
         }
@@ -3610,10 +3611,9 @@ private static boolean expressionsAreParallel(
       }
       // Treat UnaryTree expressions as their underlying type for the comparison (so, for example
       // -ve and +ve numeric literals are considered the same).
-      if (row.get(column) instanceof UnaryTree) {
-        nodeTypes.add(((UnaryTree) row.get(column)).getExpression().getKind());
-      } else {
-        nodeTypes.add(row.get(column).getKind());
+      switch (row.get(column)) {
+        case UnaryTree unary -> nodeTypes.add(unary.getExpression().getKind());
+        case ExpressionTree expression -> nodeTypes.add(expression.getKind());
       }
     }
     for (Multiset.Entry<Tree.Kind> nodeType : nodeTypes.entrySet()) {

core/src/main/java/com/google/googlejavaformat/java/Trees.java

@@ -95,9 +95,11 @@ static String getSourceForNode(Tree node, TreePath path) {
   /** Returns the simple name of a (possibly qualified) method invocation expression. */
   static Name getMethodName(MethodInvocationTree methodInvocation) {
     ExpressionTree select = methodInvocation.getMethodSelect();
-    return select instanceof MemberSelectTree memberSelectTree
-        ? memberSelectTree.getIdentifier()
-        : ((IdentifierTree) select).getName();
+    return switch (select) {
+      case MemberSelectTree memberSelect -> memberSelect.getIdentifier();
+      case IdentifierTree identifier -> identifier.getName();
+      default -> throw new AssertionError(select);
+    };
   }
 
   /** Returns the receiver of a qualified method invocation expression, or {@code null}. */