From c7ce764cffa5363727b5bf21f13d73fe9448dd5c Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 24 Mar 2011 16:11:44 +0300 Subject: [PATCH] ea-26204 --- platform/usageView/src/com/intellij/usages/ChunkExtractor.java | 2 +- .../src/com/intellij/usages/UsageInfo2UsageAdapter.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/usageView/src/com/intellij/usages/ChunkExtractor.java b/platform/usageView/src/com/intellij/usages/ChunkExtractor.java index ca9ec6d39b1c..6aa2f991828f 100644 --- a/platform/usageView/src/com/intellij/usages/ChunkExtractor.java +++ b/platform/usageView/src/com/intellij/usages/ChunkExtractor.java @@ -93,7 +93,7 @@ public class ChunkExtractor { } }; - public static TextChunk[] extractChunks(PsiFile file, UsageInfo2UsageAdapter usageAdapter) { + public static TextChunk[] extractChunks(@NotNull PsiFile file, UsageInfo2UsageAdapter usageAdapter) { return ourExtractors.get().getValue().get(file).extractChunks(usageAdapter); } diff --git a/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java b/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java index 91b0b32cee4b..1849cd9c696f 100644 --- a/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java +++ b/platform/usageView/src/com/intellij/usages/UsageInfo2UsageAdapter.java @@ -120,7 +120,8 @@ public class UsageInfo2UsageAdapter implements UsageInModule, } private TextChunk[] initChunks() { - TextChunk[] chunks = ChunkExtractor.extractChunks(getPsiFile(), this); + PsiFile file = getPsiFile(); + TextChunk[] chunks = file == null ? TextChunk.EMPTY_ARRAY : ChunkExtractor.extractChunks(file, this); myTextChunks = new SoftReference(chunks); return chunks; }