From a898760eebd8172f894b4f1b8da028e3815f1378 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 20 Mar 2012 16:10:24 +0100 Subject: [PATCH] there may be no containing file for (light) members (EA-34904) --- .../src/com/intellij/psi/impl/PsiImplUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java index 31a4851df62c..d4dcd96dd43f 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java @@ -272,7 +272,7 @@ public class PsiImplUtil { return new PsiImmediateClassType(classClass, substitutor); } - public static PsiAnnotation findAnnotation(@NotNull PsiAnnotationOwner modifierList, @NotNull String qualifiedName) { + @Nullable public static PsiAnnotation findAnnotation(@NotNull PsiAnnotationOwner modifierList, @NotNull String qualifiedName) { final String shortName = StringUtil.getShortName(qualifiedName); PsiAnnotation[] annotations = modifierList.getAnnotations(); for (PsiAnnotation annotation : annotations) { @@ -368,7 +368,7 @@ public class PsiImplUtil { } else if (member.hasModifierProperty(PsiModifier.PRIVATE)) { PsiClass topClass = PsiUtil.getTopLevelClass(member); - return topClass != null ? new LocalSearchScope(topClass) : new LocalSearchScope(file); + return topClass != null ? new LocalSearchScope(topClass) : file != null ? new LocalSearchScope(file) : maximalUseScope; } else { if (file instanceof PsiJavaFile) { @@ -388,7 +388,7 @@ public class PsiImplUtil { return getServerPageFile(element) != null; } - public static ServerPageFile getServerPageFile(final PsiElement element) { + @Nullable public static ServerPageFile getServerPageFile(final PsiElement element) { final PsiFile psiFile = PsiUtilCore.getTemplateLanguageFile(element); return psiFile instanceof ServerPageFile ? (ServerPageFile)psiFile : null; }