MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

report when notnull type is instantiated with unknown nullity (IDEA-CR-21203)

Browse Source
This commit is contained in:
peter
2017-06-06 17:41:59 +02:00
parent 10c38d0c49
commit e5b892bd23
4 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
+5 -5
View File
@@ -180,13 +180,13 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo
if (element instanceof PsiClass) {
PsiTypeParameter[] typeParameters = ((PsiClass)element).getTypeParameters();
PsiTypeElement[] typeArguments = getReferenceTypeArguments(reference);
if (typeParameters.length > 0 && typeParameters.length == typeArguments.length) {
if (typeParameters.length > 0 && typeParameters.length == typeArguments.length && !(typeArguments[0].getType() instanceof PsiDiamondType)) {
for (int i = 0; i < typeParameters.length; i++) {
if (isNullityConflict(JavaPsiFacade.getElementFactory(element.getProject()).createType(typeParameters[i]), typeArguments[i].getType())) {
if (DfaPsiUtil.getTypeNullability(JavaPsiFacade.getElementFactory(element.getProject()).createType(typeParameters[i])) ==
Nullness.NOT_NULL && DfaPsiUtil.getTypeNullability(typeArguments[i].getType()) != Nullness.NOT_NULL) {
holder.registerProblem(typeArguments[i],
"Nullable type argument where non-null one is expected",
"Non-null type argument is expected",
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
}
}
}
@@ -302,7 +302,7 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo
if (isNullableOverridingNotNull(check(targetMethod, holder, expression.getType()), superMethod)) {
holder.registerProblem(refName,
InspectionsBundle.message("inspection.nullable.problems.Nullable.method.overrides.NotNull",
getPresentableAnnoName((PsiMethod)targetMethod), getPresentableAnnoName(superMethod)),
getPresentableAnnoName(targetMethod), getPresentableAnnoName(superMethod)),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
}
else if (isNonAnnotatedOverridingNotNull(targetMethod, superMethod)) {
java/java-tests/testData/inspection/nullableProblems/NotNullCollectionItemWithNullableSuperType.java
+3 -7
View File
@@ -3,13 +3,9 @@ import java.util.*;
class MyList<T extends @NotNull Number> extends ArrayList<T> {}
class SubList extends MyList<<warning descr="Nullable type argument where non-null one is expected">@Nullable Integer</warning>> {
MyList<<warning descr="Nullable type argument where non-null one is expected">@Nullable Integer</warning>> myList;
class SubList extends MyList<<warning descr="Non-null type argument is expected">@Nullable Integer</warning>> {
MyList<<warning descr="Non-null type argument is expected">@Nullable Integer</warning>> myList;
}
class MyNonNullGenericClass<T extends @NotNull Object> {
public static void test() {
MyNonNullGenericClass<<warning descr="Nullable type argument where non-null one is expected">@Nullable String</warning>> foo = new MyNonNullGenericClass<>();
}
}
java/java-tests/testData/inspection/nullableProblems/NotNullTypeArgumentWithNullableSuperType.java
+18
View File
@@ -0,0 +1,18 @@
import typeUse.*;
import java.util.*;
class MyNonNullGenericClass<T extends @NotNull Object> {
public static void test() {
MyNonNullGenericClass<<warning descr="Non-null type argument is expected">@Nullable String</warning>> foo = new MyNonNullGenericClass<>();
}
}
class Parent<A extends @Nullable Object, B extends @NotNull Object> { }
class Child<A, B> extends Parent<B, <warning descr="Non-null type argument is expected">A</warning>> {
void test2() {
Parent<@Nullable String, <warning descr="Non-null type argument is expected">@Nullable String</warning>> p = new Parent<>();
Child<@Nullable String, @Nullable String> c = new Child<>();
}
}
java/java-tests/testSrc/com/intellij/java/codeInspection/NullableStuffInspectionTest.java
+5
View File
@@ -217,4 +217,9 @@ public class NullableStuffInspectionTest extends LightCodeInsightFixtureTestCase
doTest();
}
public void testNotNullTypeArgumentWithNullableSuperType() {
DataFlowInspection8Test.setupTypeUseAnnotations("typeUse", myFixture);
doTest();
}
}