Skip to content

Commit

Permalink
Remove the ProtoFieldNullComparison:CheckLite flag.
Browse files Browse the repository at this point in the history
RELNOTES: N/A

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=220272120
  • Loading branch information
graememorgan authored and cushon committed Nov 6, 2018
1 parent 1cab76a commit f01bb2b
Showing 1 changed file with 6 additions and 12 deletions.
Expand Up @@ -131,8 +131,9 @@ private static boolean isNull(ExpressionTree tree) {
return tree.getKind() == Kind.NULL_LITERAL; return tree.getKind() == Kind.NULL_LITERAL;
} }


/** Match proto receivers matching this. */ /** Matcher for generated protobufs. */
private final Matcher<ExpressionTree> protoReceiver; private static final Matcher<ExpressionTree> PROTO_RECEIVER =
instanceMethod().onDescendantOfAny(PROTO_SUPER_CLASS, PROTO_LITE_SUPER_CLASS);


/** Only track assignments of variables matching this. */ /** Only track assignments of variables matching this. */
private final Matcher<ExpressionTree> trackAssignments; private final Matcher<ExpressionTree> trackAssignments;
Expand All @@ -141,21 +142,14 @@ private static boolean isNull(ExpressionTree tree) {
private final boolean matchTestAssertions; private final boolean matchTestAssertions;


public ProtoFieldNullComparison(ErrorProneFlags flags) { public ProtoFieldNullComparison(ErrorProneFlags flags) {
boolean matchLite = flags.getBoolean("ProtoFieldNullComparison:MatchLite").orElse(false);
protoReceiver =
matchLite
? instanceMethod().onDescendantOfAny(PROTO_SUPER_CLASS, PROTO_LITE_SUPER_CLASS)
: instanceMethod().onDescendantOf(PROTO_SUPER_CLASS);
boolean trackServerProtoAssignments = boolean trackServerProtoAssignments =
flags.getBoolean("ProtoFieldNullComparison:TrackServerProtoAssignments").orElse(false); flags.getBoolean("ProtoFieldNullComparison:TrackServerProtoAssignments").orElse(false);
matchListGetters = flags.getBoolean("ProtoFieldNullComparison:MatchListGetters").orElse(false); matchListGetters = flags.getBoolean("ProtoFieldNullComparison:MatchListGetters").orElse(false);
matchTestAssertions = matchTestAssertions =
flags.getBoolean("ProtoFieldNullComparison:MatchTestAssertions").orElse(false); flags.getBoolean("ProtoFieldNullComparison:MatchTestAssertions").orElse(false);


ImmutableList.Builder<String> toTrack = ImmutableList.builder(); ImmutableList.Builder<String> toTrack =
if (matchLite) { ImmutableList.<String>builder().add(PROTO_LITE_SUPER_CLASS);
toTrack.add(PROTO_LITE_SUPER_CLASS);
}
if (trackServerProtoAssignments) { if (trackServerProtoAssignments) {
toTrack.add(PROTO_SUPER_CLASS); toTrack.add(PROTO_SUPER_CLASS);
} }
Expand Down Expand Up @@ -247,7 +241,7 @@ private boolean isEffectivelyFinal(@Nullable Symbol symbol) {


private Optional<Fixer> getFixer(ExpressionTree tree, VisitorState state) { private Optional<Fixer> getFixer(ExpressionTree tree, VisitorState state) {
ExpressionTree resolvedTree = getEffectiveTree(tree); ExpressionTree resolvedTree = getEffectiveTree(tree);
if (resolvedTree == null || !protoReceiver.matches(resolvedTree, state)) { if (resolvedTree == null || !PROTO_RECEIVER.matches(resolvedTree, state)) {
return Optional.empty(); return Optional.empty();
} }
return Arrays.stream(GetterTypes.values()) return Arrays.stream(GetterTypes.values())
Expand Down

0 comments on commit f01bb2b

Please sign in to comment.