From fcc7e8190abd36f796eed5166d3d3e8b0ab0eaf0 Mon Sep 17 00:00:00 2001 From: Peter Gromov Date: Mon, 14 Feb 2005 17:50:19 +0300 Subject: [PATCH] NPE fix --- .../find/findUsages/PsiElement2UsageTargetAdapter.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java b/source/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java index 9c903751b772..a4194b2ee772 100644 --- a/source/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java +++ b/source/com/intellij/find/findUsages/PsiElement2UsageTargetAdapter.java @@ -9,6 +9,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.SmartPointerManager; import com.intellij.psi.SmartPsiElementPointer; +import com.intellij.psi.PsiFile; import com.intellij.usageView.UsageViewUtil; import com.intellij.usages.UsageTarget; @@ -110,7 +111,13 @@ public class PsiElement2UsageTargetAdapter implements UsageTarget { } public VirtualFile[] getFiles() { - return isValid() ? new VirtualFile[] {myPointer.getElement().getContainingFile().getVirtualFile()} : null; + if (!isValid()) return null; + + final PsiFile psiFile = myPointer.getElement().getContainingFile(); + if (psiFile == null) return null; + + final VirtualFile virtualFile = psiFile.getVirtualFile(); + return virtualFile == null ? null : new VirtualFile[]{virtualFile}; } public static UsageTarget[] convert(PsiElement[] psiElements) {