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

[java-stubs] TypeAnnotationContainer: properly report annotation owner from generated annotations

Browse Source 
Fixes IDEA-354380 Erroneous null warning when using jspecify 0.3 NonNull bounds in generics
The wrong owner caused malfunction of a condition inside DfaPsiUtil.getElementNullability. As a result, we weren't able to merge declared nullability with instantiation-based nullability for compiled code

GitOrigin-RevId: 3ae900174cb7d34a801f07d9644997c85d257b9f
This commit is contained in:
Tagir Valeev
2024-09-12 14:55:08 +02:00
committed by intellij-monorepo-bot
parent b134b6c346
commit dbfdbb4d40
4 changed files with 67 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
java/java-psi-impl/src/com/intellij/psi/impl/cache/TypeAnnotationContainer.java vendored
View File

@@ -94,17 +94,7 @@ public class TypeAnnotationContainer {
*/
public TypeAnnotationProvider getProvider(PsiElement parent) {
if (isEmpty()) return TypeAnnotationProvider.EMPTY;
return () -> {
List<PsiAnnotation> result = new ArrayList<>();
for (TypeAnnotationEntry entry : myList) {
if (entry.myPath.length == 0) {
PsiAnnotation anno = parent instanceof PsiCompiledElement ? new ClsTypeAnnotationImpl(parent, entry.myText) :
JavaPsiFacade.getElementFactory(parent.getProject()).createAnnotationFromText(entry.myText, parent);
result.add(anno);
}
}
return result.toArray(PsiAnnotation.EMPTY_ARRAY);
};
return new TypeAnnotationContainerProvider(parent, ObjectUtils.tryCast(parent, PsiAnnotationOwner.class));
}
/**
@@ -340,10 +330,12 @@ public class TypeAnnotationContainer {
private final NotNullLazyValue<ClsJavaCodeReferenceElementImpl> myReferenceElement;
private final NotNullLazyValue<ClsAnnotationParameterListImpl> myParameterList;
private final PsiElement myParent;
private final @Nullable PsiAnnotationOwner myOwner;
private final String myText;
ClsTypeAnnotationImpl(PsiElement parent, String text) {
ClsTypeAnnotationImpl(PsiElement parent, @Nullable PsiAnnotationOwner owner, String text) {
myParent = parent;
myOwner = owner;
myText = text;
myReferenceElement = NotNullLazyValue.atomicLazy(() -> {
int index = myText.indexOf('(');
@@ -391,7 +383,7 @@ public class TypeAnnotationContainer {
@Override
public @Nullable PsiAnnotationOwner getOwner() {
return ObjectUtils.tryCast(myParent, PsiAnnotationOwner.class);
return myOwner;
}
@Override
@@ -432,4 +424,32 @@ public class TypeAnnotationContainer {
}
}
}
private class TypeAnnotationContainerProvider implements TypeAnnotationProvider {
private final PsiElement myParent;
private final @Nullable PsiAnnotationOwner myOwner;
private TypeAnnotationContainerProvider(PsiElement parent, @Nullable PsiAnnotationOwner owner) {
myParent = parent;
myOwner = owner;
}
@Override
public @NotNull TypeAnnotationProvider withOwner(@NotNull PsiAnnotationOwner owner) {
return new TypeAnnotationContainerProvider(myParent, owner);
}
@Override
public @NotNull PsiAnnotation @NotNull [] getAnnotations() {
List<PsiAnnotation> result = new ArrayList<>();
for (TypeAnnotationEntry entry : myList) {
if (entry.myPath.length == 0) {
PsiAnnotation anno = myParent instanceof PsiCompiledElement ? new ClsTypeAnnotationImpl(myParent, myOwner, entry.myText) :
JavaPsiFacade.getElementFactory(myParent.getProject()).createAnnotationFromText(entry.myText, myParent);
result.add(anno);
}
}
return result.toArray(PsiAnnotation.EMPTY_ARRAY);
}
}
}