From fd36687a777983328f9bf0a65dd0b26d3e3a6880 Mon Sep 17 00:00:00 2001 From: Mikhail Pyltsin Date: Wed, 14 Jan 2026 13:08:41 +0100 Subject: [PATCH] IJ-CR-187719 [java-inspection] IDEA-382441 jspecify inspection doesn't highlight assignments - fix using labels GitOrigin-RevId: 59f30bc05372fec687d713dbb7c6d596fd324ee5 --- .../resources/messages/JavaAnalysisBundle.properties | 5 +++-- .../nullable/NullableStuffInspectionBase.java | 2 +- .../PassingNullableCollectionWhereNotNullIsExpected.java | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties index ddc5f8021ca1..faec1cec50cd 100644 --- a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties +++ b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties @@ -132,11 +132,12 @@ annotate.overridden.methods.parameters.nonnull=Annotate overriding method parame annotate.overridden.methods.parameters.nullable=Annotate overriding method parameters as nullable anonymous.ref.loc.can.be.replaced.with.0=Anonymous #ref can be replaced with {0} anonymous.ref.loc.can.be.replaced.with.lambda=Anonymous #ref can be replaced with lambda -assigning.a.collection.of.nullable.elements=\ +assigning.a.collection.of.nullable.elements=Assigning a collection of nullable elements into a collection of non-null elements +assigning.a.class.with.nullable.elements=\ \ Assigning a class with nullable type arguments when a class with not-null type arguments is expected{0}\ -assigning.a.collection.of.notnull.elements=\ +assigning.a.class.with.notnull.elements=\ \ Assigning a class with not-null type arguments when a class with nullable type arguments is expected{0}\ diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java index 4eb38f2dcea9..afa170dc50c5 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java @@ -1367,7 +1367,7 @@ public class NullableStuffInspectionBase extends AbstractBaseJavaLocalInspection private enum ConflictNestedTypeProblem{ RETURN_NESTED_TYPE_PROBLEM("returning.a.class.with.notnull.arguments", "returning.a.class.with.nullable.arguments"), - ASSIGNMENT_NESTED_TYPE_PROBLEM("assigning.a.collection.of.notnull.elements", "assigning.a.collection.of.nullable.elements"), + ASSIGNMENT_NESTED_TYPE_PROBLEM("assigning.a.class.with.notnull.elements", "assigning.a.class.with.nullable.elements"), ; @NotNull diff --git a/java/java-tests/testData/inspection/nullableProblems/PassingNullableCollectionWhereNotNullIsExpected.java b/java/java-tests/testData/inspection/nullableProblems/PassingNullableCollectionWhereNotNullIsExpected.java index 6de55c97050a..f9764d228c48 100644 --- a/java/java-tests/testData/inspection/nullableProblems/PassingNullableCollectionWhereNotNullIsExpected.java +++ b/java/java-tests/testData/inspection/nullableProblems/PassingNullableCollectionWhereNotNullIsExpected.java @@ -6,7 +6,7 @@ class JC { void testList() { List<@Nullable String> nullableList = new ArrayList<>(); - print(nullableList); + print(nullableList); List<@NotNull String> list2 = nullableList; @@ -28,8 +28,8 @@ class JC { List<@NotNull String> testReturnValue() { List<@Nullable String> list = new ArrayList<>(); - Supplier> supplier = () -> list; - Supplier> supplierRef = this::getNullableList; + Supplier> supplier = () -> list; + Supplier> supplierRef = this::getNullableList; Supplier> supplier3 = () -> { return list;};