From 33dfd5bb6b66becf4009345170ead16bfc50abd3 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 10 Jul 2012 20:51:27 +0400
Subject: [PATCH] Lazy resolve: Package-level objects are handled properly

---
 .../jet/lang/resolve/lazy/AbstractLazyMemberScope.java     | 5 ++++-
 .../lazyResolve/namespaceComparator/packageLevelObject.kt  | 4 ++++
 .../lazyResolve/namespaceComparator/packageLevelObject.txt | 7 +++++++
 .../lazy/LazyResolveNamespaceComparingTestGenerated.java   | 5 +++++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt
 create mode 100644 compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt

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 c81721e2559..badc29026a0 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
@@ -145,7 +145,10 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
         JetClassOrObject classOrObjectDeclaration = declarationProvider.getClassOrObjectDeclaration(name);
         if (classOrObjectDeclaration instanceof JetObjectDeclaration) {
             JetObjectDeclaration objectDeclaration = (JetObjectDeclaration) classOrObjectDeclaration;
-            ClassDescriptor classifier = (ClassDescriptor) getClassifier(name);
+            ClassDescriptor classifier = getObjectDescriptor(name);
+            if (classifier == null) {
+                throw new IllegalStateException("Object declaration " + name + " found in the DeclarationProvider " + declarationProvider + " but not in the scope " + this);
+            }
             VariableDescriptor propertyDescriptor = resolveSession.getInjector().getDescriptorResolver()
                     .resolveObjectDeclaration(thisDescriptor, objectDeclaration, classifier, resolveSession.getTrace());
             result.add(propertyDescriptor);
diff --git a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt
new file mode 100644
index 00000000000..dc2194f9876
--- /dev/null
+++ b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt
@@ -0,0 +1,4 @@
+package foo
+
+object Bar {
+}
\ No newline at end of file
diff --git a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
new file mode 100644
index 00000000000..10ca6ab510d
--- /dev/null
+++ b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
@@ -0,0 +1,7 @@
+namespace <root>
+
+// <namespace name="foo">
+namespace foo
+
+internal final val Bar: foo.Bar
+// </namespace name="foo">
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 ca8f45fa83b..87b06fc4aae 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -1275,6 +1275,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             doTest("compiler/testData/lazyResolve/namespaceComparator/genericFunction.kt");
         }
         
+        @TestMetadata("packageLevelObject.kt")
+        public void testPackageLevelObject() throws Exception {
+            doTest("compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt");
+        }
+        
         @TestMetadata("simpleClass.kt")
         public void testSimpleClass() throws Exception {
             doTest("compiler/testData/lazyResolve/namespaceComparator/simpleClass.kt");