errorprone 2.3.3 -> 2.3.4

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/GradleCacheableTaskAction.java

@@ -28,7 +28,6 @@
 import com.google.errorprone.matchers.method.MethodMatchers;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.LambdaExpressionTree;
-import java.util.regex.Pattern;
 
 @AutoService(BugChecker.class)
 @BugPattern(
@@ -44,10 +43,12 @@ public final class GradleCacheableTaskAction extends BugChecker implements Lambd
 
     private static final Matcher<ExpressionTree> TASK_ACTION = MethodMatchers.instanceMethod()
             .onDescendantOf("org.gradle.api.Task")
-            .withNameMatching(Pattern.compile("doFirst|doLast"));
+            .namedAnyOf("doFirst", "doLast");
 
     private static final Matcher<ExpressionTree> IS_TASK_ACTION =
-            Matchers.allOf(Matchers.parentNode(Matchers.methodInvocation(TASK_ACTION)), IS_ACTION);
+            Matchers.allOf(
+                    Matchers.parentNode(Matchers.toType(ExpressionTree.class, Matchers.methodInvocation(TASK_ACTION))),
+                    IS_ACTION);
 
     @Override
     public Description matchLambdaExpression(LambdaExpressionTree tree, VisitorState state) {

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/ReadReturnValueIgnored.java

@@ -104,8 +104,8 @@ public Matcher<? super ExpressionTree> specializedMatcher() {
     }
 
     @Override
-    public Description describe(MethodInvocationTree methodInvocationTree, VisitorState state) {
-        Description result = super.describe(methodInvocationTree, state);
+    public Description describeReturnValueIgnored(MethodInvocationTree methodInvocationTree, VisitorState state) {
+        Description result = super.describeReturnValueIgnored(methodInvocationTree, state);
         if (Description.NO_MATCH.equals(result)) {
             return result;
         }

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/StrictUnusedVariable.java

@@ -434,7 +434,8 @@ private static ImmutableList<SuggestedFix> buildUnusedVarFixes(
                                             ? null
                                             : state.getSourceForNode(variableTree.getModifiers()));
                     String newContent = String.format(
-                            "%s%s unused", modifiers.isEmpty() ? "" : (modifiers + " "), variableTree.getType());
+                            "%s%s unused", modifiers.isEmpty() ? "" : (modifiers + " "),
+                            state.getSourceForNode(variableTree.getType()));
                     // The new content for the second fix should be identical to the content for the first
                     // fix in this case because we can't just remove the enhanced for loop variable.
                     fix.replace(variableTree, newContent);

baseline-error-prone/src/test/java/com/palantir/baseline/errorprone/Slf4jConstantLogMessageTests.java

@@ -17,23 +17,15 @@
 package com.palantir.baseline.errorprone;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
 @Execution(ExecutionMode.CONCURRENT)
 public final class Slf4jConstantLogMessageTests {
 
-    private CompilationTestHelper compilationHelper;
-
-    @BeforeEach
-    public void before() {
-        compilationHelper = CompilationTestHelper.newInstance(Slf4jConstantLogMessage.class, getClass());
-    }
-
-    private void test(String log) throws Exception {
-        compilationHelper
+    private void test(String log) {
+        helper()
                 .addSourceLines(
                         "Test.java",
                         "import org.slf4j.Logger;",
@@ -76,8 +68,8 @@ public void testNonCompileTimeConstantExpression() throws Exception {
     }
 
     @Test
-    public void negative() throws Exception {
-        compilationHelper
+    public void negative() {
+        helper()
                 .addSourceLines(
                         "Test.java",
                         "import org.slf4j.Logger;",
@@ -150,4 +142,7 @@ public void negative() throws Exception {
                 .doTest();
     }
 
+    private CompilationTestHelper helper() {
+        return CompilationTestHelper.newInstance(Slf4jConstantLogMessage.class, getClass());
+    }
 }

build.gradle

@@ -54,6 +54,7 @@ allprojects {
                 check("PreferSafeLoggableExceptions", CheckSeverity.OFF)
                 check("PreferSafeLoggingPreconditions", CheckSeverity.OFF)
                 check("PreconditionsConstantMessage", CheckSeverity.OFF)
+                check("GradleCacheableTaskAction", CheckSeverity.OFF)
             }
         }
     }

changelog/@unreleased/pr-1082.v2.yml

@@ -0,0 +1,7 @@
+type: improvement
+improvement:
+  description: "We now run error-prone 2.3.4, to benefit from smarter static analysis,
+    and hopefully pick up the claimed performance Improvements: \n\n> 40% speedup
+    when run against Google's codebase with errors enabled."
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/1082

versions.props

@@ -1,9 +1,9 @@
 com.diffplug.spotless:spotless-plugin-gradle = 3.26.0
 com.google.auto.service:auto-service = 1.0-rc4
-com.google.errorprone:error_prone_annotations = 2.3.3
-com.google.errorprone:error_prone_core = 2.3.3
-com.google.errorprone:error_prone_refaster = 2.3.3
-com.google.errorprone:error_prone_test_helpers = 2.3.3
+com.google.errorprone:error_prone_annotations = 2.3.4
+com.google.errorprone:error_prone_core = 2.3.4
+com.google.errorprone:error_prone_refaster = 2.3.4
+com.google.errorprone:error_prone_test_helpers = 2.3.4
 com.google.guava:guava = 27.1-jre
 com.netflix.nebula:nebula-dependency-recommender = 9.0.0
 com.palantir.configurationresolver:gradle-configuration-resolver-plugin = 0.4.0