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

support type inference with nullity annotations across different language levels

Browse Source
This commit is contained in:
peter
2017-02-24 15:27:24 +01:00
parent 87aeeacbb0
commit 1163a8e717
8 changed files with 154 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/NullityAnnotationModifier.java
+19 -14
View File
@@ -16,7 +16,6 @@
package com.intellij.codeInsight;
import com.intellij.psi.PsiAnnotation;
import com.intellij.psi.PsiClassType;
import com.intellij.psi.PsiType;
import com.intellij.psi.TypeAnnotationProvider;
import com.intellij.psi.augment.TypeAnnotationModifier;
@@ -32,11 +31,12 @@ import java.util.List;
public class NullityAnnotationModifier extends TypeAnnotationModifier {
@Nullable
@Override
public TypeAnnotationProvider modifyAnnotations(@NotNull PsiType inferenceVariableType, @NotNull PsiClassType boundType) {
public TypeAnnotationProvider boundAppeared(@NotNull PsiType inferenceVariableType, @NotNull PsiType boundType) {
PsiAnnotation[] annotations = inferenceVariableType.getAnnotations();
for (PsiAnnotation annotation : annotations) {
String qName = annotation.getQualifiedName();
if (qName != null && isMatchingAnnotation(boundType, annotation, qName)) {
if (qName != null && (NullableNotNullManager.isNullableAnnotation(annotation) || NullableNotNullManager
.isNotNullAnnotation(annotation)) && boundType.findAnnotation(qName) != null) {
return removeAnnotation(annotations, annotation);
}
}
@@ -44,20 +44,25 @@ public class NullityAnnotationModifier extends TypeAnnotationModifier {
return null;
}
@Nullable
@Override
public TypeAnnotationProvider modifyLowerBoundAnnotations(@NotNull PsiType lowerBound, @NotNull PsiType upperBound) {
PsiAnnotation[] lowerAnnotations = lowerBound.getAnnotations();
PsiAnnotation nullable = findNullable(lowerAnnotations);
if (nullable != null && findNullable(upperBound.getAnnotations()) == null) {
return removeAnnotation(lowerAnnotations, nullable);
}
return null;
}
private static PsiAnnotation findNullable(PsiAnnotation[] annotations) {
return ContainerUtil.find(annotations, NullableNotNullManager::isNullableAnnotation);
}
@NotNull
private static TypeAnnotationProvider removeAnnotation(PsiAnnotation[] annotations, PsiAnnotation annotation) {
List<PsiAnnotation> list = ContainerUtil.newArrayList(annotations);
list.remove(annotation);
if (list.isEmpty()) {
return TypeAnnotationProvider.EMPTY;
}
PsiAnnotation[] array = list.toArray(PsiAnnotation.EMPTY_ARRAY);
return () -> array;
}
private static boolean isMatchingAnnotation(@NotNull PsiClassType boundType, PsiAnnotation annotation, String qName) {
NullableNotNullManager manager = NullableNotNullManager.getInstance(annotation.getProject());
return (manager.getNullables().contains(qName) || manager.getNotNulls().contains(qName)) && boundType.findAnnotation(qName) != null;
return TypeAnnotationProvider.Static.create(list.toArray(PsiAnnotation.EMPTY_ARRAY));
}
}