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 4dc89f7b22d5..6eca622274dc 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 @@ -418,7 +418,7 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo private static boolean isNotNullNotInferred(@NotNull PsiMethod superMethod) { Project project = superMethod.getProject(); - PsiAnnotation notNull = NullableNotNullManager.getInstance(project).getNotNullAnnotation(superMethod); + PsiAnnotation notNull = NullableNotNullManager.getInstance(project).getNotNullAnnotation(superMethod, true); return notNull != null && !InferredAnnotationsManager.getInstance(project).isInferredAnnotation(notNull); } diff --git a/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java b/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java index b5ccb269aa1d..21e014e4aca3 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java @@ -94,13 +94,13 @@ public class NullableNotNullManager implements PersistentStateComponent @Nullable public String getNullable(PsiModifierListOwner owner) { - PsiAnnotation annotation = getNullableAnnotation(owner); + PsiAnnotation annotation = getNullableAnnotation(owner, false); return annotation == null ? null : annotation.getQualifiedName(); } @Nullable - public PsiAnnotation getNullableAnnotation(PsiModifierListOwner owner) { - return findNullabilityAnnotation(owner, false, true); + public PsiAnnotation getNullableAnnotation(PsiModifierListOwner owner, boolean checkBases) { + return findNullabilityAnnotation(owner, checkBases, true); } public void setDefaultNullable(@NotNull String defaultNullable) { @@ -113,13 +113,13 @@ public class NullableNotNullManager implements PersistentStateComponent } @Nullable - public PsiAnnotation getNotNullAnnotation(PsiModifierListOwner owner) { - return findNullabilityAnnotation(owner, false, false); + public PsiAnnotation getNotNullAnnotation(PsiModifierListOwner owner, boolean checkBases) { + return findNullabilityAnnotation(owner, checkBases, false); } @Nullable public String getNotNull(PsiModifierListOwner owner) { - PsiAnnotation annotation = getNotNullAnnotation(owner); + PsiAnnotation annotation = getNotNullAnnotation(owner, false); return annotation == null ? null : annotation.getQualifiedName(); }