diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/ArrayComponentAndMethodAnnotationConflict.java b/java/java-tests/testData/inspection/dataFlow/fixture/ArrayComponentAndMethodAnnotationConflict.java index 2b58f950ec77..5a673d7eaaf0 100644 --- a/java/java-tests/testData/inspection/dataFlow/fixture/ArrayComponentAndMethodAnnotationConflict.java +++ b/java/java-tests/testData/inspection/dataFlow/fixture/ArrayComponentAndMethodAnnotationConflict.java @@ -19,17 +19,17 @@ class FooImpl implements Foo { return null; } else if (Math.random() > 0.5) { - @NotNull Object @Nullable [] arr1 = new Object[]{null, new Object(), Math.random() > 0.5 ? new Object() : null}; - @NotNull Object @Nullable [] arr2 = {null, new Object(), Math.random() > 0.5 ? new Object() : null}; - return new Object[]{null, new Object(), Math.random() > 0.5 ? new Object() : null}; + @NotNull Object @Nullable [] arr1 = new Object[]{null, new Object(), Math.random() > 0.5 ? new Object() : null}; + @NotNull Object @Nullable [] arr2 = {null, new Object(), Math.random() > 0.5 ? new Object() : null}; + return new Object[]{null, new Object(), Math.random() > 0.5 ? new Object() : null}; } - return new @NotNull Object @Nullable []{null, new Object(), Math.random() > 0.5 ? new Object() : null}; + return new @NotNull Object @Nullable []{null, new Object(), Math.random() > 0.5 ? new Object() : null}; } void test() { @NotNull Object @Nullable [] array = getNullableArrayOfNotNullObjects(); assert array != null; - array[0] = null; + array[0] = null; array[1] = Math.random() > 0.5 ? null : "foo"; } } \ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties index f9e9b5a4f378..d8bd935f33c5 100644 --- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties +++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties @@ -85,7 +85,7 @@ dataflow.message.passing.nullable.argument=Argument #ref #loc might dataflow.message.passing.nullable.argument.methodref=Method reference argument might be null dataflow.message.assigning.null=null is assigned to a variable that is annotated with @NotNull dataflow.message.assigning.nullable=Expression #ref might evaluate to null but is assigned to a variable that is annotated with @NotNull -dataflow.message.storing.array.null=null is stored to an array which elements are @NotNull +dataflow.message.storing.array.null=null is stored to an array of @NotNull elements dataflow.message.storing.array.nullable=Expression #ref might evaluate to null but is stored to an array of @NotNull elements dataflow.message.return.null.from.notnull=null is returned by the method declared as @{0} dataflow.message.return.nullable.from.notnull=Expression #ref might evaluate to null but is returned by the method declared as @{0}