From 5af3770563417910527ebbe48046b6d2fec81230 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 16 Mar 2012 18:42:53 +0400 Subject: [PATCH] Assetion for EA-34591 - NPE: AbstractLightClass.isValid --- .../org/jetbrains/jet/asJava/JetLightClass.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java index 4d8d37c1e79..ff7c88fdcbf 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java @@ -82,23 +82,23 @@ public class JetLightClass extends AbstractLightClass implements JetJavaMirrorMa return new JetLightClass(getManager(), file, qualifiedName); } - @Override - public PsiFile getContainingFile() { - return file; - } - + @NotNull @Override public PsiClass getDelegate() { if (delegate == null) { - // TODO: What is the reason for this? delegate = findClass(qualifiedName, getStub()); if (delegate == null) { - delegate = findClass(qualifiedName, getStub()); + throw new IllegalStateException("Class not found for qualified name: " + qualifiedName); } } return delegate; } + @Override + public PsiFile getContainingFile() { + return file; + } + private static PsiClass findClass(FqName fqn, StubElement stub) { if (stub instanceof PsiClassStub && Comparing.equal(fqn.getFqName(), ((PsiClassStub) stub).getQualifiedName())) { return (PsiClass) stub.getPsi();