From eb54cf6fe5c2e75444bdb098f160ffd81cd594ec Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 7 Jun 2011 12:13:17 +0400 Subject: [PATCH] NPE --- .../lang-impl/src/com/intellij/usageView/UsageViewUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java b/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java index dc33a1af367b..d1956b928f34 100644 --- a/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java +++ b/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java @@ -125,9 +125,11 @@ public class UsageViewUtil { TextRange rangeInElement = usage.getRangeInElement(); assert rangeInElement != null : usage; TextRange range = rangeInElement.shiftRight(injectionOffsetInMasterFile); + PsiFile containingFile = context.getContainingFile(); + if (containingFile == null) continue; //move package to another package set.remove( NonCodeUsageInfo.create( - context.getContainingFile(), + containingFile, range.getStartOffset(), range.getEndOffset(), ((MoveRenameUsageInfo)usage).getReferencedElement(),