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] ExternalAnnotationsManager.findExternalAnnotations: NotNull

Browse Source 
GitOrigin-RevId: cbd3821a7d6d43d7a0c77039312b612ee0137b73
This commit is contained in:
Tagir Valeev
2024-09-18 10:11:25 +02:00
committed by intellij-monorepo-bot
parent 04b872d204
commit 1d83886b74
9 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
View File

@@ -478,9 +478,7 @@ public class AnnotationUtil {
final Project project = owner.getProject();
final PsiAnnotation[] externalAnnotations = ExternalAnnotationsManager.getInstance(project).findExternalAnnotations(owner);
if (externalAnnotations != null) {
annotations = ArrayUtil.mergeArrays(annotations, externalAnnotations, PsiAnnotation.ARRAY_FACTORY);
}
annotations = ArrayUtil.mergeArrays(annotations, externalAnnotations, PsiAnnotation.ARRAY_FACTORY);
if (withInferred) {
final PsiAnnotation[] inferredAnnotations = InferredAnnotationsManager.getInstance(project).findInferredAnnotations(owner);
annotations = ArrayUtil.mergeArrays(annotations, inferredAnnotations, PsiAnnotation.ARRAY_FACTORY);

2
java/java-psi-api/src/com/intellij/codeInsight/ExternalAnnotationsManager.java
View File

@@ -90,7 +90,7 @@ public abstract class ExternalAnnotationsManager {
// Method used in Kotlin plugin
public abstract boolean isExternalAnnotationWritable(@NotNull PsiModifierListOwner listOwner, @NotNull String annotationFQN);
public abstract PsiAnnotation @Nullable [] findExternalAnnotations(@NotNull PsiModifierListOwner listOwner);
public abstract @NotNull PsiAnnotation @NotNull [] findExternalAnnotations(@NotNull PsiModifierListOwner listOwner);
/**
* Returns external annotations associated with default