azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lazy resolve: Objects don't show up as classifiers

Browse Source
This commit is contained in:
Andrey Breslav
2012-07-19 12:50:36 +04:00
parent ebc87ea34d
commit eb1a279c67
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
+10 -1
View File
@@ -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();