MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 23:31:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-analysis] NullableNotNullManager: take into account container for super owners as well

Browse Source 
GitOrigin-RevId: b64e2e9453855fb5cad0279dd59a71080630931c
This commit is contained in:
Tagir Valeev
2024-10-07 17:40:14 +02:00
committed by intellij-monorepo-bot
parent 4ceb708839
commit bfda3761a4
2 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
View File

@@ -149,27 +149,14 @@ public abstract class NullableNotNullManager {
protected final @Nullable NullabilityAnnotationInfo doFindEffectiveNullabilityAnnotation(@NotNull PsiModifierListOwner owner) {
NullabilityAnnotationDataHolder annotations = getAllNullabilityAnnotationsWithNickNames();
NullabilityAnnotationInfo result = findPlainAnnotation(owner, false, annotations);
if (result != null) {
return result;
}
boolean lambdaParameter = owner instanceof PsiParameter && owner.getParent() instanceof PsiParameterList &&
owner.getParent().getParent() instanceof PsiLambdaExpression;
if (!lambdaParameter) {
// For lambda parameter, inherited annotation overrides the default one
NullabilityAnnotationInfo defaultInfo = findNullityDefaultFiltered(owner);
if (defaultInfo != null) return defaultInfo;
}
NullabilityAnnotationInfo result = findPlainOrContainerAnnotation(owner, annotations);
if (result != null) return result;
if (owner instanceof PsiMethod) {
AnnotationAndOwner inHierarchy =
findAnnotationAndOwnerInHierarchy(owner, annotations.qualifiedNames(), false);
if (inHierarchy != null) {
Nullability nullability = annotations.getNullability(inHierarchy.annotation.getQualifiedName());
if (nullability != null) {
return new NullabilityAnnotationInfo(inHierarchy.annotation, nullability, inHierarchy.owner, false);
for (PsiModifierListOwner superOwner : getSuperAnnotationOwners(owner)) {
NullabilityAnnotationInfo superAnno = findPlainOrContainerAnnotation(superOwner, annotations);
if (superAnno != null) {
return superAnno.withInheritedFrom(superOwner);
}
}
}
@@ -190,8 +177,23 @@ public abstract class NullableNotNullManager {
}
}
if (lambdaParameter) {
return findNullityDefaultFiltered(owner);
return null;
}
private @Nullable NullabilityAnnotationInfo findPlainOrContainerAnnotation(@NotNull PsiModifierListOwner owner,
@NotNull NullabilityAnnotationDataHolder annotations) {
NullabilityAnnotationInfo result = findPlainAnnotation(owner, false, annotations);
if (result != null) {
return result;
}
boolean lambdaParameter = owner instanceof PsiParameter && owner.getParent() instanceof PsiParameterList &&
owner.getParent().getParent() instanceof PsiLambdaExpression;
if (!lambdaParameter) {
// For lambda parameter, default annotation is ignored
NullabilityAnnotationInfo defaultInfo = findNullityDefaultFiltered(owner);
if (defaultInfo != null) return defaultInfo;
}
return null;
}