Change getEndPosition signature to accept Trees

MOE_MIGRATED_REVID=128086178
google · Jul 22, 2016 · bb0f833 · bb0f833
1 parent 6a025bf
commit bb0f833
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 34 deletions.
diff --git a/core/src/main/java/com/google/errorprone/VisitorState.java b/core/src/main/java/com/google/errorprone/VisitorState.java
@@ -23,7 +23,6 @@
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.util.ErrorProneToken;
 import com.google.errorprone.util.ErrorProneTokens;
-
 import com.sun.source.tree.Tree;
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.code.Symbol;
@@ -44,7 +43,6 @@
 import com.sun.tools.javac.util.Name;
 import com.sun.tools.javac.util.Names;
 import com.sun.tools.javac.util.Options;
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
@@ -322,17 +320,13 @@ public ImmutableList<ErrorProneToken> getTokensForNode(Tree tree) {
     return ErrorProneTokens.getTokens(getSourceForNode(tree), context);
   }
 
-  /**
+  /** Returns the end position of the node, or -1 if it is not available. */
-   * Gets the end position of the given node.
+  public int getEndPosition(Tree node) {
-   *
-   * @return the end position of the node, or -1 if it is not available
-   */
-  public int getEndPosition(JCTree node) {
     JCCompilationUnit compilationUnit = (JCCompilationUnit) getPath().getCompilationUnit();
     if (compilationUnit.endPositions == null) {
       return -1;
     }
-    return node.getEndPosition(compilationUnit.endPositions);
+    return ((JCTree) node).getEndPosition(compilationUnit.endPositions);
   }
 
   /**

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ClassNewInstance.java b/core/src/main/java/com/google/errorprone/bugpatterns/ClassNewInstance.java
@@ -32,7 +32,6 @@
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Matcher;
 import com.google.errorprone.util.ASTHelpers;
-
 import com.sun.source.tree.CatchTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MethodInvocationTree;
@@ -44,7 +43,6 @@
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.TreeScanner;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -79,8 +77,8 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
     }
     SuggestedFix.Builder fix = SuggestedFix.builder();
     fix.replace(
-        state.getEndPosition((JCTree) ASTHelpers.getReceiver(tree)),
+        state.getEndPosition(ASTHelpers.getReceiver(tree)),
-        state.getEndPosition((JCTree) tree),
+        state.getEndPosition(tree),
         String.format(".getConstructor().newInstance()"));
     boolean fixedExceptions = fixExceptions(state, fix);
     if (!fixedExceptions) {

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/DefaultCharset.java b/core/src/main/java/com/google/errorprone/bugpatterns/DefaultCharset.java
@@ -37,17 +37,14 @@
 import com.google.errorprone.matchers.Matcher;
 import com.google.errorprone.suppliers.Suppliers;
 import com.google.errorprone.util.ASTHelpers;
-
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.ImportTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.NewClassTree;
 import com.sun.source.tree.Tree;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.Options;
-
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileReader;
@@ -359,8 +356,8 @@ private Fix appendCharset(
     SuggestedFix.Builder fix = SuggestedFix.builder();
     if (arguments.isEmpty()) {
       fix.replace(
-          state.getEndPosition((JCTree) select),
+          state.getEndPosition(select),
-          state.getEndPosition((JCTree) tree),
+          state.getEndPosition(tree),
           String.format("(%s)", charset.replacement()));
     } else {
       fix.postfixWith(Iterables.getLast(arguments), ", " + charset.replacement());

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/GetClassOnAnnotation.java b/core/src/main/java/com/google/errorprone/bugpatterns/GetClassOnAnnotation.java
@@ -27,11 +27,8 @@
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Matcher;
 import com.google.errorprone.util.ASTHelpers;
-
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MethodInvocationTree;
-import com.sun.tools.javac.tree.JCTree;
-
 import java.lang.annotation.Annotation;
 
 /** @author cushon@google.com (Liam Miller-Cushon) */
@@ -57,8 +54,8 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
       return describeMatch(
           tree,
           SuggestedFix.replace(
-              state.getEndPosition((JCTree) ASTHelpers.getReceiver(tree)),
+              state.getEndPosition(ASTHelpers.getReceiver(tree)),
-              state.getEndPosition((JCTree) tree),
+              state.getEndPosition(tree),
               ".annotationType()"));
     }
     return Description.NO_MATCH;

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/GetClassOnEnum.java b/core/src/main/java/com/google/errorprone/bugpatterns/GetClassOnEnum.java
@@ -27,10 +27,8 @@
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Matcher;
 import com.google.errorprone.util.ASTHelpers;
-
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MethodInvocationTree;
-import com.sun.tools.javac.tree.JCTree;
 
 /** @author cushon@google.com (Liam Miller-Cushon) */
 @BugPattern(
@@ -51,8 +49,8 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
       return describeMatch(
           tree,
           SuggestedFix.replace(
-              state.getEndPosition((JCTree) ASTHelpers.getReceiver(tree)),
+              state.getEndPosition(ASTHelpers.getReceiver(tree)),
-              state.getEndPosition((JCTree) tree),
+              state.getEndPosition(tree),
               ".getDeclaringClass()"));
     }
     return Description.NO_MATCH;

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MissingCasesInEnumSwitch.java b/core/src/main/java/com/google/errorprone/bugpatterns/MissingCasesInEnumSwitch.java
@@ -28,7 +28,6 @@
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Description.Builder;
 import com.google.errorprone.util.ASTHelpers;
-
 import com.sun.source.tree.CaseTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.IdentifierTree;
@@ -37,11 +36,9 @@
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCSwitch;
 import com.sun.tools.javac.tree.TreeInfo;
-
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import javax.lang.model.element.ElementKind;
 
 /**
@@ -86,7 +83,7 @@ public Description matchSwitch(SwitchTree tree, VisitorState state) {
   private void buildFixes(
       SwitchTree tree, VisitorState state, Set<String> unhandled, Builder description) {
 
-    int idx = state.getEndPosition((JCTree) tree) - 1; // preserve closing '}'
+    int idx = state.getEndPosition(tree) - 1; // preserve closing '}'
 
     StringBuilder sb = new StringBuilder();
     for (String label : unhandled) {

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryTypeArgument.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryTypeArgument.java
@@ -29,14 +29,12 @@
 import com.google.errorprone.fixes.SuggestedFix;
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.util.ASTHelpers;
-
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.NewClassTree;
 import com.sun.source.tree.Tree;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.MethodSymbol;
 import com.sun.tools.javac.tree.JCTree;
-
 import java.util.List;
 
 /**
@@ -91,7 +89,7 @@ private Fix buildFix(Tree tree, List<? extends Tree> arguments, VisitorState sta
     JCTree node = (JCTree) tree;
     int startAbsolute = node.getStartPosition();
     int lower = ((JCTree) arguments.get(0)).getStartPosition() - startAbsolute;
-    int upper = state.getEndPosition((JCTree) arguments.get(arguments.size() - 1)) - startAbsolute;
+    int upper = state.getEndPosition(arguments.get(arguments.size() - 1)) - startAbsolute;
 
     CharSequence source = state.getSourceForNode(node);