Recommend using var for var unused = ...; and var thrown = assertThrows(MyException.class, () -> ...);

kluever · Error Prone Team · commit ad513d5a82dc · 2024-02-26T10:47:08.000-08:00
PiperOrigin-RevId: 610457244
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/Varifier.java b/core/src/main/java/com/google/errorprone/bugpatterns/Varifier.java
@@ -67,6 +67,9 @@ public final class Varifier extends BugChecker implements VariableTreeMatcher {
                 && isSameType(((MethodSymbol) symbol).getReturnType(), symbol.owner.type, s);
           });
 
+  private static final Matcher<ExpressionTree> ASSERT_THROWS =
+      staticMethod().onClass("org.junit.Assert").named("assertThrows");
+
   @Override
   public Description matchVariable(VariableTree tree, VisitorState state) {
     var symbol = getSymbol(tree);
@@ -77,6 +80,14 @@ public Description matchVariable(VariableTree tree, VisitorState state) {
         || hasImplicitType(tree, state)) {
       return NO_MATCH;
     }
+    // Foo unused = ...;
+    if (symbol.getSimpleName().contentEquals("unused")) {
+      return fix(tree);
+    }
+    // MyException exception = assertThrows(MyException.class, () -> ...);
+    if (ASSERT_THROWS.matches(initializer, state)) {
+      return fix(tree);
+    }
     // Foo foo = (Foo) bar;
     if (initializer instanceof TypeCastTree
         && isSameType(
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/VarifierTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/VarifierTest.java
@@ -176,4 +176,50 @@ public void fromFactoryMethod() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void varUnused() {
+    refactoringHelper
+        .addInputLines(
+            "Test.java",
+            "class Test {",
+            "  public void trim(String string) {",
+            "    String unused = string.trim();",
+            "  }",
+            "}")
+        .addOutputLines(
+            "Test.java",
+            "class Test {",
+            "  public void trim(String string) {",
+            "    var unused = string.trim();",
+            "  }",
+            "}")
+        .doTest();
+  }
+
+  @Test
+  public void assertThrows() {
+    refactoringHelper
+        .addInputLines(
+            "Test.java",
+            "import static org.junit.Assert.assertThrows;",
+            "class Test {",
+            "  public void testFoo() {",
+            "    Object nil = null;",
+            "    NullPointerException thrown = ",
+            "        assertThrows(NullPointerException.class, () -> nil.toString());",
+            "  }",
+            "}")
+        .addOutputLines(
+            "Test.java",
+            "import static org.junit.Assert.assertThrows;",
+            "class Test {",
+            "  public void testFoo() {",
+            "    Object nil = null;",
+            "    var thrown = ",
+            "        assertThrows(NullPointerException.class, () -> nil.toString());",
+            "  }",
+            "}")
+        .doTest();
+  }
 }
