Merge branch 'switch-statement-rule' into switch-expressions-jjjpv-3

build.gradle

@@ -2,7 +2,7 @@ import de.undercouch.gradle.tasks.download.Download
 
 plugins {
     // https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow (v5 requires Gradle 5)
-    id 'com.github.johnrengelman.shadow' version '7.1.0'
+    id 'com.github.johnrengelman.shadow' version '7.1.1'
     // https://plugins.gradle.org/plugin/de.undercouch.download
     id "de.undercouch.download" version "4.1.2"
     id 'java'
@@ -690,15 +690,11 @@ subprojects {
         //  * Temporarily comment out "-Werror" elsewhere in this file
         //  * Repeatedly run `./gradlew clean compileJava` and fix all errors
         //  * Uncomment "-Werror"
-        //  * Don't edit framework/build.gradle to use the same version number
-        //    (it is updated when the annotated version of Guava is updated).
-        errorprone group: 'com.google.errorprone', name: 'error_prone_core', version: '2.10.0'
+      ext.errorproneVersion = '2.10.0'
+      errorprone group: 'com.google.errorprone', name: 'error_prone_core', version: errorproneVersion
 
       // TODO: it's a bug that annotatedlib:guava requires the error_prone_annotations dependency.
-      // Update the next two version numbers in tandem.  Get the Error Prone version from the "compile
-      // dependencies" section of https://mvnrepository.com/artifact/com.google.guava/guava/30.1.1-jre .
-      // (It isn't at https://mvnrepository.com/artifact/org.checkerframework.annotatedlib/guava/30.1.1-jre, which is the bug.)
-      annotatedGuava 'com.google.errorprone:error_prone_annotations:2.5.1'
+      annotatedGuava "com.google.errorprone:error_prone_annotations:${errorproneVersion}"
       annotatedGuava ('org.checkerframework.annotatedlib:guava:30.1.1-jre') {
         // So long as Guava only uses annotations from checker-qual, excluding it should not cause problems.
         exclude group: 'org.checkerframework'

checker/tests/nullness/java17/NullnessSwitchArrows.java

@@ -36,8 +36,6 @@ void method2() {
       default -> throw new IllegalStateException("Invalid day: " + day);
     }
 
-    // TODO: this is a false positive.  It works for case: statements; see below.
-    // :: error: (dereference.of.nullable)
     o.toString();
   }
 

checker/tests/nullness/java17/NullnessSwitchExpressions.java

@@ -36,8 +36,6 @@ void method2() {
           default -> throw new IllegalStateException("Invalid day: " + day);
         };
 
-    // TODO: This is a false positive.
-    // :: error: (dereference.of.nullable)
     o.toString();
   }
 
@@ -51,8 +49,6 @@ void method3() {
             String s = null;
             if (day == Day.THURSDAY) {
               s = "hello";
-              // TODO: This is a false positive.
-              // :: error: (dereference.of.nullable)
               s.toString();
             }
             yield s;

checker/tests/nullness/java17/NullnessSwitchStatementRules.java

@@ -0,0 +1,43 @@
+// @below-java17-jdk-skip-test
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class NullnessSwitchStatementRules {
+  @Nullable Object field = null;
+
+  void method(int selector) {
+    field = new Object();
+    switch (selector) {
+      case 1 -> field = null;
+      case 2 -> field.toString();
+    }
+
+    field = new Object();
+    switch (selector) {
+      case 1 -> {
+        field = null;
+      }
+      case 2 -> {
+        field.toString();
+      }
+    }
+
+    field = new Object();
+    switch (selector) {
+      case 1 -> {
+        field = null;
+      }
+      case 2 -> {
+        field.toString();
+      }
+    }
+
+    field = new Object();
+    switch (selector) {
+      case 1:
+        field = null;
+      case 2:
+        // :: error: (dereference.of.nullable)
+        field.toString();
+    }
+  }
+}

checker/tests/nullness/java17/SwitchExpressionInvariant.java

@@ -0,0 +1,27 @@
+// @below-java17-jdk-skip-test
+import java.util.List;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class SwitchExpressionInvariant {
+  public static boolean flag = false;
+
+  void method(
+      List<@NonNull String> nonnullStrings, List<@Nullable String> nullableStrings, int fenum) {
+
+    List<@NonNull String> list =
+        // :: error: (assignment)
+        switch (fenum) {
+            // :: error: (switch.expression)
+          case 1 -> nonnullStrings;
+          default -> nullableStrings;
+        };
+
+    List<@Nullable String> list2 =
+        switch (fenum) {
+            // :: error: (switch.expression)
+          case 1 -> nonnullStrings;
+          default -> nullableStrings;
+        };
+  }
+}