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

[java-dfa] Support JSR-305 unknown nullability

Browse Source 
Fixes IDEA-278618 JSR-305 @Nonnull(when = UNKNOWN) not handled correctly

GitOrigin-RevId: 5983fbdcaad42dd5db8e1c8adb27cedbb9a746e2
This commit is contained in:
Tagir Valeev
2021-09-24 05:54:17 +00:00
committed by intellij-monorepo-bot
parent 9d6899a508
commit 86d0145b26
6 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
+7 -1
View File
@@ -237,7 +237,7 @@ public abstract class NullableNotNullManager {
}
};
NullabilityAnnotationInfo result = findPlainAnnotation(owner, false, false, filtered);
return result == null ? null : result.getAnnotation();
return result == null || !nullabilities.contains(result.getNullability()) ? null : result.getAnnotation();
}
private @Nullable NullabilityAnnotationInfo findPlainAnnotation(
@@ -260,6 +260,7 @@ public abstract class NullableNotNullManager {
if (memberAnno != null) {
Nullability nullability = annotations.getNullability(memberAnno.annotation.getQualifiedName());
if (nullability == null) return null;
nullability = correctNullability(nullability, memberAnno.annotation);
if (type != null) {
for (PsiAnnotation typeAnno : type.getApplicableAnnotations()) {
if (typeAnno == memberAnno.annotation) continue;
@@ -279,6 +280,10 @@ public abstract class NullableNotNullManager {
return findAnnotationInTypeHierarchy(type, annotations);
}
protected @NotNull Nullability correctNullability(@NotNull Nullability nullability, @NotNull PsiAnnotation annotation) {
return nullability;
}
private static boolean areDifferentNullityAnnotations(@NotNull PsiAnnotation memberAnno, @NotNull PsiAnnotation typeAnno) {
NullableNotNullManager manager = getInstance(memberAnno.getProject());
List<String> notNulls = manager.getNotNullsWithNickNames();
@@ -437,6 +442,7 @@ public abstract class NullableNotNullManager {
if (qualifiedNames.qualifiedNames().contains(qualifiedName)) {
Nullability nullability = qualifiedNames.getNullability(qualifiedName);
if (nullability != null) {
nullability = correctNullability(nullability, annotation);
result.set(new NullabilityAnnotationInfo(annotation, nullability, false));
}
return false;