From 0cf69f8a23fc764a6d89f77d443844f273cf4201 Mon Sep 17 00:00:00 2001 From: Ilya Klyuchnikov Date: Mon, 21 Jul 2014 15:47:39 +0400 Subject: [PATCH] bytecode analysis: resolve only wrt PsiClassOwner (IDEA-127608) --- .../bytecodeAnalysis/BytecodeAnalysisConverter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisConverter.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisConverter.java index 38eaf83dbe2a..f29dd7f6cf0c 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisConverter.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisConverter.java @@ -263,11 +263,12 @@ public class BytecodeAnalysisConverter implements ApplicationComponent { private int mkPsiClassKey(PsiClass psiClass, int dimensions) throws IOException { - PsiClassOwner psiFile = (PsiClassOwner) psiClass.getContainingFile(); - if (psiFile == null) { - LOG.debug("getContainingFile was null for " + psiClass.getQualifiedName()); + PsiFile containingFile = psiClass.getContainingFile(); + if (!(containingFile instanceof PsiClassOwner)) { + LOG.debug("containingFile was not resolved for " + psiClass.getQualifiedName()); return -1; } + PsiClassOwner psiFile = (PsiClassOwner)containingFile; String packageName = psiFile.getPackageName(); String qname = psiClass.getQualifiedName(); if (qname == null) {