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

Test for resolving static members of java enum

Browse Source 
Add clarifying note
This commit is contained in:
Pavel V. Talanov
2012-11-11 17:28:52 +04:00
parent b5b6f58b6b
commit 3ae89dbb1d
4 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java
+11 -6
View File
@@ -160,13 +160,18 @@ public final class JavaNamespaceResolver {
}
PsiClass psiClass = psiClassFinder.findPsiClass(fqName, PsiClassFinder.RuntimeClassesHandleMode.IGNORE);
if (psiClass != null && !psiClass.isEnum()) {
trace.record(JavaBindingContext.JAVA_NAMESPACE_KIND, namespaceDescriptor, JavaNamespaceKind.CLASS_STATICS);
return new JavaClassStaticMembersScope(namespaceDescriptor,
createDeclarationProviderForClassStaticMembers(psiClass),
fqName, javaSemanticServices);
if (psiClass == null) {
return null;
}
return null;
if (psiClass.isEnum()) {
// NOTE: we don't want to create namespace for enum classes because we put
// static members of enum class into class object descriptor
return null;
}
trace.record(JavaBindingContext.JAVA_NAMESPACE_KIND, namespaceDescriptor, JavaNamespaceKind.CLASS_STATICS);
return new JavaClassStaticMembersScope(namespaceDescriptor,
createDeclarationProviderForClassStaticMembers(psiClass),
fqName, javaSemanticServices);
}
private void cache(@NotNull FqName fqName, @Nullable JavaBaseScope packageScope) {