From eb1a279c67b845288b34210e6a464b7d82697f53 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 19 Jul 2012 12:50:36 +0400
Subject: [PATCH] Lazy resolve: Objects don't show up as classifiers

---
 .../lang/resolve/lazy/AbstractLazyMemberScope.java    | 11 ++++++++++-
 .../lazyResolve/namespaceComparator/innerObject.kt    |  3 +++
 .../LazyResolveNamespaceComparingTestGenerated.java   |  5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 compiler/testData/lazyResolve/namespaceComparator/innerObject.kt

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
index badc29026a0..f07d59febe3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
@@ -73,7 +73,9 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
                                                                   JetClassInfoUtil.createClassLikeInfo(classOrObjectDeclaration));
 
         classDescriptors.put(name, classDescriptor);
-        allDescriptors.add(classDescriptor);
+        if (!object) {
+            allDescriptors.add(classDescriptor);
+        }
 
         return classDescriptor;
     }
@@ -204,6 +206,13 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
                     getProperties(name);
                 }
             }
+            else if (declaration instanceof JetObjectDeclaration) {
+                JetClassOrObject classOrObject = (JetClassOrObject) declaration;
+                Name name = classOrObject.getNameAsName();
+                if (name != null) {
+                    getProperties(name);
+                }
+            }
             else if (declaration instanceof JetClassOrObject) {
                 JetClassOrObject classOrObject = (JetClassOrObject) declaration;
                 Name name = classOrObject.getNameAsName();
diff --git a/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt b/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt
new file mode 100644
index 00000000000..e450e8587d3
--- /dev/null
+++ b/compiler/testData/lazyResolve/namespaceComparator/innerObject.kt
@@ -0,0 +1,3 @@
+class B {
+  object Obj {}
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index f4e03071e39..dac10adacfc 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -1277,6 +1277,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             doTest("compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt");
         }
         
+        @TestMetadata("innerObject.kt")
+        public void testInnerObject() throws Exception {
+            doTest("compiler/testData/lazyResolve/namespaceComparator/innerObject.kt");
+        }
+        
         @TestMetadata("packageLevelObject.kt")
         public void testPackageLevelObject() throws Exception {
             doTest("compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt");