diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeyword.java b/core/src/main/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeyword.java index 18b3249bf300..b74a72d1b33d 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeyword.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeyword.java @@ -29,7 +29,6 @@ import com.google.common.collect.ImmutableSet; import com.google.errorprone.BugPattern; -import com.google.errorprone.ErrorProneFlags; import com.google.errorprone.VisitorState; import com.google.errorprone.bugpatterns.BugChecker.ClassTreeMatcher; import com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher; @@ -47,7 +46,6 @@ import com.sun.tools.javac.code.Symbol.ClassSymbol; import com.sun.tools.javac.code.Symbol.MethodSymbol; import java.util.Collections; -import javax.inject.Inject; /** * Warns on classes or methods being named similarly to contextual keywords, or invoking such @@ -87,23 +85,8 @@ public final class NamedLikeContextualKeyword extends BugChecker "com.google.auto.value.processor.AutoValueProcessor", "com.google.auto.value.processor.AutoOneOfProcessor"); - private final boolean enableMethodNames; - private final boolean enableClassNames; - - @Inject - NamedLikeContextualKeyword(ErrorProneFlags flags) { - this.enableMethodNames = - flags.getBoolean("NamedLikeContextualKeyword:EnableMethodNames").orElse(false); - this.enableClassNames = - flags.getBoolean("NamedLikeContextualKeyword:EnableClassNames").orElse(false); - } - @Override public Description matchMethod(MethodTree tree, VisitorState state) { - if (!this.enableMethodNames) { - return NO_MATCH; - } - MethodSymbol methodSymbol = ASTHelpers.getSymbol(tree); // Don't alert if an @Auto... class (safe since reference always qualified). @@ -122,10 +105,6 @@ public Description matchMethod(MethodTree tree, VisitorState state) { @Override public Description matchClass(ClassTree tree, VisitorState state) { - if (!this.enableClassNames) { - return NO_MATCH; - } - if (DISALLOWED_CLASS_NAMES.contains(tree.getSimpleName().toString())) { return describeMatch(tree); } diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeywordTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeywordTest.java index da56f24f4128..7f2a74d52f3d 100644 --- a/core/src/test/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeywordTest.java +++ b/core/src/test/java/com/google/errorprone/bugpatterns/NamedLikeContextualKeywordTest.java @@ -46,7 +46,6 @@ public void instanceMethodName_error() { " foo = new NullPointerException(\"uh oh\");", " }", "}") - .setArgs(ImmutableList.of("-XepOpt:NamedLikeContextualKeyword:EnableMethodNames")) .doTest(); } @@ -65,7 +64,6 @@ public void staticMethodName_error() { " foo = new NullPointerException(\"uh oh\");", " }", "}") - .setArgs(ImmutableList.of("-XepOpt:NamedLikeContextualKeyword:EnableMethodNames")) .doTest(); } @@ -85,7 +83,6 @@ public void autoOneOfMethodName_noError() { " foo = new NullPointerException(\"uh oh\");", " }", "}") - .setArgs("-XepOpt:NamedLikeContextualKeyword:EnableMethodNames") .doTest(); } @@ -105,7 +102,6 @@ public void autoValueMethodName_noError() { " foo = new NullPointerException(\"uh oh\");", " }", "}") - .setArgs("-XepOpt:NamedLikeContextualKeyword:EnableMethodNames") .doTest(); } @@ -126,7 +122,6 @@ public void generatedButNotAuto_error() { " foo = new NullPointerException(\"uh oh\");", " }", "}") - .setArgs("-XepOpt:NamedLikeContextualKeyword:EnableMethodNames") .doTest(); } @@ -140,7 +135,6 @@ public void className_error() { " public module() {", " }", "}") - .setArgs(ImmutableList.of("-XepOpt:NamedLikeContextualKeyword:EnableClassNames")) .doTest(); } @@ -161,10 +155,6 @@ public void yieldInSwitch_noError() { " };", " }", "}") - .setArgs( - ImmutableList.of( - "-XepOpt:NamedLikeContextualKeyword:EnableMethodNames", - "-XepOpt:NamedLikeContextualKeyword:EnableClassNames")) .doTest(); } @@ -188,10 +178,6 @@ public void interfaceImplementation_noError() { " @SuppressWarnings(\"NamedLikeContextualKeyword\")", " void yield();", "}") - .setArgs( - ImmutableList.of( - "-XepOpt:NamedLikeContextualKeyword:EnableMethodNames", - "-XepOpt:NamedLikeContextualKeyword:EnableClassNames")) .doTest(); } @@ -215,10 +201,6 @@ public void nonAnnotatedOverride_noError() { " @SuppressWarnings(\"NamedLikeContextualKeyword\")", " void yield() {}", "}") - .setArgs( - ImmutableList.of( - "-XepOpt:NamedLikeContextualKeyword:EnableMethodNames", - "-XepOpt:NamedLikeContextualKeyword:EnableClassNames")) .doTest(); } @@ -243,10 +225,6 @@ public void annotatedOverride_noError() { " @SuppressWarnings(\"NamedLikeContextualKeyword\")", " void yield() {}", "}") - .setArgs( - ImmutableList.of( - "-XepOpt:NamedLikeContextualKeyword:EnableMethodNames", - "-XepOpt:NamedLikeContextualKeyword:EnableClassNames")) .doTest(); } @@ -263,12 +241,7 @@ public void positive() { " yield();", " }", "}") - .setArgs( - ImmutableList.of( - "--release", - "11", - "-XepOpt:NamedLikeContextualKeyword:EnableMethodNames", - "-XepOpt:NamedLikeContextualKeyword:EnableClassNames")) + .setArgs(ImmutableList.of("--release", "11")) .doTest(); } @@ -291,12 +264,7 @@ public void enclosing() { " }", " }", "}") - .setArgs( - ImmutableList.of( - "--release", - "11", - "-XepOpt:NamedLikeContextualKeyword:EnableMethodNames", - "-XepOpt:NamedLikeContextualKeyword:EnableClassNames")) + .setArgs(ImmutableList.of("--release", "11")) .doTest(); } @@ -315,12 +283,7 @@ public void staticMethod() { " }", " }", "}") - .setArgs( - ImmutableList.of( - "--release", - "11", - "-XepOpt:NamedLikeContextualKeyword:EnableMethodNames", - "-XepOpt:NamedLikeContextualKeyword:EnableClassNames")) + .setArgs(ImmutableList.of("--release", "11")) .doTest(); } }