From cb4dadb9aad46a47ddbf405860caca116072a5d9 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Fri, 4 Apr 2014 19:13:53 +0400
Subject: [PATCH] Retrieve JetClassObject element by stub in
 ResolveSession#getClassDescriptor()

---
 .../org/jetbrains/jet/lang/psi/JetObjectDeclaration.java  | 8 ++++++++
 .../jetbrains/jet/lang/resolve/lazy/ResolveSession.java   | 8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
index 61ad922b993..9b7e63481c8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
@@ -101,6 +101,14 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub<PsiJetObjectSt
         return parent != null && parent.getNode().getElementType().equals(JetNodeTypes.CLASS_OBJECT);
     }
 
+    @Nullable
+    public JetClassObject getClassObjectElement() {
+        if (!isClassObject()) {
+            return null;
+        }
+        return (JetClassObject) getParentByStub();
+    }
+
     @Override
     public boolean hasModifier(JetModifierKeywordToken modifier) {
         JetModifierList modifierList = getModifierList();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
index 55880133b6f..3fc8dd31bae 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
@@ -256,8 +256,12 @@ public class ResolveSession implements KotlinCodeAnalyzer {
     @Override
     @NotNull
     public ClassDescriptor getClassDescriptor(@NotNull JetClassOrObject classOrObject) {
-        if (classOrObject.getParent() instanceof JetClassObject) {
-            return getClassObjectDescriptor((JetClassObject) classOrObject.getParent());
+        if (classOrObject instanceof JetObjectDeclaration) {
+            JetObjectDeclaration objectDeclaration = (JetObjectDeclaration) classOrObject;
+            JetClassObject classObjectElement = objectDeclaration.getClassObjectElement();
+            if (classObjectElement != null) {
+                return getClassObjectDescriptor(classObjectElement);
+            }
         }
         JetScope resolutionScope = getScopeProvider().getResolutionScopeForDeclaration(classOrObject);
         Name name = safeNameForLazyResolve(classOrObject.getNameAsName());