Merge branch 'master' into issue-1082-jspecify

uber · Dec 12, 2024 · 2d922fd · 2d922fd
2 parents 82b188d + 1fc39b3
commit 2d922fd
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 6 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -502,13 +502,8 @@ public Description matchAssignment(AssignmentTree tree, VisitorState state) {
           String message = "Writing @Nullable expression into array with @NonNull contents.";
           ErrorMessage errorMessage =
               new ErrorMessage(MessageTypes.ASSIGN_NULLABLE_TO_NONNULL_ARRAY, message);
-          // Future enhancements which auto-fix such warnings will require modification to this
-          // logic
           return errorBuilder.createErrorDescription(
-              errorMessage,
-              buildDescription(tree),
-              state,
-              ASTHelpers.getSymbol(tree.getVariable()));
+              errorMessage, buildDescription(tree), state, arraySymbol);
         }
       }
     }

diff --git a/nullaway/src/test/java/com/uber/nullaway/SerializationTest.java b/nullaway/src/test/java/com/uber/nullaway/SerializationTest.java
@@ -2126,4 +2126,46 @@ public void anonymousSubClassConstructorSerializationTest() {
         .setOutputFileNameAndHeader(ERROR_FILE_NAME, ERROR_FILE_HEADER)
         .doTest();
   }
+
+  @Test
+  public void errorSerializationTestArrayComponentNull() {
+    SerializationTestHelper<ErrorDisplay> tester = new SerializationTestHelper<>(root);
+    tester
+        .setArgs(
+            Arrays.asList(
+                "-d",
+                temporaryFolder.getRoot().getAbsolutePath(),
+                "-XepOpt:NullAway:AnnotatedPackages=com.uber",
+                "-XepOpt:NullAway:SerializeFixMetadata=true",
+                "-XepOpt:NullAway:JSpecifyMode=true",
+                "-XepOpt:NullAway:FixSerializationConfigPath=" + configPath))
+        .addSourceLines(
+            "com/uber/A.java",
+            "package com.uber;",
+            "import org.jspecify.annotations.Nullable;",
+            "public class A {",
+            "  String [] foo = {\"SomeRandomWords\"};",
+            "  void spin() {",
+            "    // BUG: Diagnostic contains: Writing @Nullable expression into array with @NonNull contents.",
+            "    foo[1] = null;",
+            "  }",
+            "}")
+        .setExpectedOutputs(
+            new ErrorDisplay(
+                "ASSIGN_NULLABLE_TO_NONNULL_ARRAY",
+                "Writing @Nullable expression into array with @NonNull contents.",
+                "com.uber.A",
+                "spin()",
+                233,
+                "com/uber/A.java",
+                "FIELD",
+                "com.uber.A",
+                "null",
+                "foo",
+                "null",
+                "com/uber/A.java"))
+        .setFactory(errorDisplayFactory)
+        .setOutputFileNameAndHeader(ERROR_FILE_NAME, ERROR_FILE_HEADER)
+        .doTest();
+  }
 }