diff --git a/java/java-psi-api/src/com/intellij/codeInsight/TypeNullability.java b/java/java-psi-api/src/com/intellij/codeInsight/TypeNullability.java index f2eed46ea2a7..20302f625dfa 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/TypeNullability.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/TypeNullability.java @@ -65,6 +65,11 @@ public final class TypeNullability { return inherited.equals(mySource) ? this : new TypeNullability(myNullability, inherited); } + /** + * @param nullability instantiation nullability + * @return the nullability of the instantiated type parameter, + * assuming that this object is the declared nullability of the type parameter. + */ public @NotNull TypeNullability instantiatedWith(@NotNull TypeNullability nullability) { if (this.nullability() == nullability.nullability()) { return intersect(Arrays.asList(this, nullability)); diff --git a/java/java-psi-api/src/com/intellij/util/JavaTypeNullabilityUtil.java b/java/java-psi-api/src/com/intellij/util/JavaTypeNullabilityUtil.java index 7ddabfebbf67..3dd84f53bf13 100644 --- a/java/java-psi-api/src/com/intellij/util/JavaTypeNullabilityUtil.java +++ b/java/java-psi-api/src/com/intellij/util/JavaTypeNullabilityUtil.java @@ -82,7 +82,7 @@ public final class JavaTypeNullabilityUtil { for (PsiAnnotation annotation : annotations) { String qualifiedName = annotation.getQualifiedName(); NullableNotNullManager manager = NullableNotNullManager.getInstance(annotation.getProject()); - if (manager == null) continue; + if (manager == null) return TypeNullability.UNKNOWN; Optional optionalNullability = manager.getAnnotationNullability(qualifiedName); if (optionalNullability.isPresent()) { Nullability nullability = optionalNullability.get();