Match new errorprone api
When updating errorprone to 2.32.0, we need to update some plugins
to use the new apis.
Bug: 253827323
Test: Presubmits
Change-Id: I754e1df3bb3e7988d2e34ca91bed65e3d5cac2e0
diff --git a/errorprone/Android.bp b/errorprone/Android.bp
index c1d2235..b559a15 100644
--- a/errorprone/Android.bp
+++ b/errorprone/Android.bp
@@ -22,6 +22,7 @@
static_libs: [
"annotations",
+ "jsr305",
"framework-annotations-lib",
"//external/error_prone:error_prone_core",
],
diff --git a/errorprone/java/com/google/errorprone/bugpatterns/android/HideInCommentsChecker.java b/errorprone/java/com/google/errorprone/bugpatterns/android/HideInCommentsChecker.java
index 8dc9579..6d5e4484 100644
--- a/errorprone/java/com/google/errorprone/bugpatterns/android/HideInCommentsChecker.java
+++ b/errorprone/java/com/google/errorprone/bugpatterns/android/HideInCommentsChecker.java
@@ -29,6 +29,7 @@
import com.google.errorprone.fixes.SuggestedFix;
import com.google.errorprone.matchers.Description;
import com.google.errorprone.util.ASTHelpers;
+import com.google.errorprone.util.ErrorProneComment;
import com.google.errorprone.util.ErrorProneToken;
import com.google.errorprone.util.ErrorProneTokens;
import com.sun.source.tree.ClassTree;
@@ -37,7 +38,6 @@
import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.VariableTree;
-import com.sun.tools.javac.parser.Tokens;
import java.util.HashMap;
import java.util.Map;
@@ -66,7 +66,7 @@
final Map<Integer, Tree> javadocableTrees = findJavadocableTrees(tree, state);
final String sourceCode = state.getSourceCode().toString();
for (ErrorProneToken token : ErrorProneTokens.getTokens(sourceCode, state.context)) {
- for (Tokens.Comment comment : token.comments()) {
+ for (ErrorProneComment comment : token.comments()) {
if (!javadocableTrees.containsKey(token.pos())) {
continue;
}
@@ -81,7 +81,7 @@
return NO_MATCH;
}
- private static Optional<SuggestedFix> generateFix(Tokens.Comment comment) {
+ private static Optional<SuggestedFix> generateFix(ErrorProneComment comment) {
final String text = comment.getText();
if (text.startsWith("/**")) {
return Optional.empty();