Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7980ecd authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Match new errorprone api" into main

parents 9091de21 dae7aace

errorprone/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ java_library_host { 


    static_libs: [

        "annotations",

        "jsr305",

        "framework-annotations-lib",

        "//external/error_prone:error_prone_core",

    ],

errorprone/java/com/google/errorprone/bugpatterns/android/HideInCommentsChecker.java

+3 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.google.errorprone.bugpatterns.BugChecker; 
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.MethodTree; 
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 @@ public class HideInCommentsChecker extends BugChecker implements 
        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 @@ public class HideInCommentsChecker extends BugChecker implements 
        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();