From f996fccffa1e090981a122f8041c31fef030498b Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 9 Mar 2012 16:33:45 +0400 Subject: [PATCH] fix tests --- .../codeInsight/completion/JavaCompletionUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java index 12adae0a1fcd..60a9855b45e9 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -557,15 +557,16 @@ public class JavaCompletionUtil { public static boolean containsMember(PsiType qualifierType, Object object) { if (qualifierType instanceof PsiArrayType && object instanceof PsiMember) { //length and clone() - if (((PsiMember)object).getContainingFile().getVirtualFile() == null) { //yes, they're a bit dummy + PsiFile file = ((PsiMember)object).getContainingFile(); + if (file == null || file.getVirtualFile() == null) { //yes, they're a bit dummy return true; } } else if (qualifierType instanceof PsiClassType) { PsiClass qualifierClass = ((PsiClassType)qualifierType).resolve(); if (qualifierClass == null) return false; - if (object instanceof PsiMethod) { - return qualifierClass.findMethodBySignature((PsiMethod)object, false) != null; + if (object instanceof PsiMethod && qualifierClass.findMethodBySignature((PsiMethod)object, false) != null) { + return true; } if (object instanceof PsiMember) { return qualifierClass.equals(((PsiMember)object).getContainingClass());