Update end position handling

After
openjdk/jdk@43af7b5,
javac sets the end position to the start position instead of NOPOS for nodes
that don't have an end position.

PiperOrigin-RevId: 836370643

Author: cushon

check_api/src/main/java/com/google/errorprone/VisitorState.java

@@ -19,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.errorprone.util.ASTHelpers.getStartPosition;
+import static com.google.errorprone.util.ASTHelpers.hasExplicitSource;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
@@ -557,7 +558,7 @@ public Type arrayTypeForType(Type baseType) {
     int start = getStartPosition(tree);
     int end = getEndPosition(tree);
     CharSequence source = getSourceCode();
-    if (end == -1) {
+    if (!hasExplicitSource(tree, this)) {
       return null;
     }
     checkArgument(start >= 0, "invalid start position (%s) for: %s", start, tree);

check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java

@@ -768,7 +768,7 @@ private static SuggestedFix renameClass(ClassTree tree, String replacement, Visi
     int endPos =
         tree.getMembers().stream()
             .map(state::getEndPosition)
-            .filter(p -> p != NOPOS)
+            .filter(p -> p != NOPOS && p != basePos)
             .findFirst()
             .orElse(state.getEndPosition(tree));
     List<ErrorProneToken> tokens = state.getOffsetTokens(basePos, endPos);

check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java

@@ -2130,7 +2130,9 @@ public static boolean hasImplicitType(VariableTree tree, VisitorState state) {
 
   /** Returns whether the given tree has an explicit source code representation. */
   public static boolean hasExplicitSource(Tree tree, VisitorState state) {
-    return getStartPosition(tree) != Position.NOPOS && state.getEndPosition(tree) != Position.NOPOS;
+    int pos = getStartPosition(tree);
+    int endPos = state.getEndPosition(tree);
+    return pos != Position.NOPOS && endPos != Position.NOPOS && pos != endPos;
   }
 
   /** Returns {@code true} if this symbol was declared in Kotlin source. */

core/src/main/java/com/google/errorprone/bugpatterns/AbstractMustBeClosedChecker.java

@@ -32,6 +32,7 @@
 import static com.google.errorprone.util.ASTHelpers.getSymbol;
 import static com.google.errorprone.util.ASTHelpers.getType;
 import static com.google.errorprone.util.ASTHelpers.hasAnnotation;
+import static com.google.errorprone.util.ASTHelpers.hasExplicitSource;
 import static com.google.errorprone.util.ASTHelpers.hasImplicitType;
 import static com.google.errorprone.util.ASTHelpers.isConsideredFinal;
 import static com.google.errorprone.util.ASTHelpers.isInStaticInitializer;
@@ -70,7 +71,6 @@
 import com.sun.tools.javac.code.Symbol.MethodSymbol;
 import com.sun.tools.javac.code.Symbol.VarSymbol;
 import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.util.Position;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -507,7 +507,7 @@ private static Optional<Change> wrapTryFinallyAroundVariableScope(
     }
     Tree declTree = decl.getType();
     String declType =
-        state.getEndPosition(declTree) == Position.NOPOS ? "var" : state.getSourceForNode(declTree);
+        !hasExplicitSource(declTree, state) ? "var" : state.getSourceForNode(declTree);
 
     return Change.builder(
             SuggestedFix.builder()