Allow CONST_CASE != null in YodaCondition

Follow-up to 9b2c2a9 PiperOrigin-RevId: 622020333
google · Apr 5, 2024 · 23547ac · 23547ac
1 parent 200eb43
commit 23547ac
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/YodaCondition.java b/core/src/main/java/com/google/errorprone/bugpatterns/YodaCondition.java
@@ -120,6 +120,9 @@ private static boolean seemsConstant(Tree tree) {
     if (constValue(tree) != null) {
       return true;
     }
+    if (tree.getKind().equals(Tree.Kind.NULL_LITERAL)) {
+      return true;
+    }
     var symbol = getSymbol(tree);
     if (!(symbol instanceof VarSymbol)) {
       return false;

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/YodaConditionTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/YodaConditionTest.java
@@ -18,6 +18,7 @@
 
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
 import com.google.errorprone.BugCheckerRefactoringTestHelper.FixChoosers;
+import com.google.errorprone.CompilationTestHelper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -27,6 +28,9 @@ public final class YodaConditionTest {
   private final BugCheckerRefactoringTestHelper refactoring =
       BugCheckerRefactoringTestHelper.newInstance(YodaCondition.class, getClass());
 
+  private final CompilationTestHelper testHelper =
+      CompilationTestHelper.newInstance(YodaCondition.class, getClass());
+
   @Test
   public void primitive() {
     refactoring
@@ -205,4 +209,18 @@ public void provablyNonNull_nullIntolerantFix() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void nullableConstant() {
+    testHelper
+        .addSourceLines(
+            "Test.java",
+            "class Test {",
+            "  private static final String CONST = null;",
+            "  public static boolean f() {",
+            "    return CONST != null;",
+            "  }",
+            "}")
+        .doTest();
+  }
 }