MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-dfa] NotNullByDefault: implicit Object bound is affected by annotation; more tests (IDEA-359811)

Browse Source 
GitOrigin-RevId: a3576ee5f2b100b7e68536881a55d0c9a2f9771b
This commit is contained in:
Tagir Valeev
2024-10-02 13:30:41 +02:00
committed by intellij-monorepo-bot
parent 3ec30c1c1b
commit b223a53bc3
3 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaPsiUtil.java
View File

@@ -99,13 +99,13 @@ public final class DfaPsiUtil {
if (DumbService.isDumb(owner.getProject())) return Nullability.UNKNOWN;
NullabilityAnnotationInfo fromAnnotation = getNullabilityFromAnnotation(owner, ignoreParameterNullabilityInference);
if (fromAnnotation != null) {
if (fromAnnotation.getNullability() == Nullability.NULLABLE &&
if (fromAnnotation.getNullability() != Nullability.NOT_NULL &&
owner instanceof PsiMethod method) {
PsiType type = method.getReturnType();
PsiAnnotationOwner annotationOwner = fromAnnotation.getAnnotation().getOwner();
if (PsiUtil.resolveClassInClassTypeOnly(type) instanceof PsiTypeParameter &&
annotationOwner instanceof PsiType && annotationOwner != type) {
// Nullable from type hierarchy: should check the instantiation, as it could be more concrete
// Nullable/Unknown from type hierarchy: should check the instantiation, as it could be more concrete
Nullability fromType = getNullabilityFromType(resultType, owner);
if (fromType != null) return fromType;
}
@@ -158,7 +158,7 @@ public final class DfaPsiUtil {
if (owner instanceof PsiParameter parameter && parameter.getDeclarationScope() instanceof PsiMethod method) {
int index = method.getParameterList().getParameterIndex(parameter);
List<StandardMethodContract> contracts = JavaMethodContractUtil.getMethodContracts(method);
return ContainerUtil.exists(contracts,
return ContainerUtil.exists(contracts,
c -> c.getParameterConstraint(index) == StandardMethodContract.ValueConstraint.NULL_VALUE);
}
return false;
@@ -210,7 +210,7 @@ public final class DfaPsiUtil {
if (iteratedValue == null) return null;
PsiType iteratedType = iteratedValue.getType();
if (iteratedValue instanceof PsiReferenceExpression refExpr &&
if (iteratedValue instanceof PsiReferenceExpression refExpr &&
refExpr.resolve() instanceof PsiParameter parameter &&
parameter.getParent() instanceof PsiForeachStatement targetLoop &&
PsiTreeUtil.isAncestor(targetLoop, loop, true) &&