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

Commit b7ea2023 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Match new errorprone api" into main am: e7980ecd am: 63e0d4ed 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3302485



Change-Id: I037b5ffd411fe431a4bbaa8f699ec48ed7e66d46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21b60ad8 63e0d4ed

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();