From 9356af8d7300fff930f47a0938046547e1457d4c Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 29 Oct 2013 16:20:38 +0400 Subject: [PATCH] No classes are resolved through package scope for class static members --- .../java/lazy/descriptors/LazyJavaPackageFragmentScope.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt index 85bfce6032f..1253503e4c2 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt @@ -74,8 +74,10 @@ public class LazyPackageFragmentScopeForJavaClass( ) : LazyJavaPackageFragmentScope(c, packageFragment) { override fun computeMemberIndex(): MemberIndex = ClassMemberIndex(jClass, mustBeStatic = true) + // nested classes are loaded as members of their outer classes, not packages + override fun getAllClassNames(): Collection = listOf() + override fun getClassifier(name: Name): ClassifierDescriptor? = null - override fun getAllClassNames(): Collection = listOf() // nested classes are loaded as members of their outer classes, not packages override fun getAllPackageNames(): Collection = jClass.getInnerClasses().iterator() .filter { c -> c.isStatic() && JavaNamespaceResolver.hasStaticMembers(c) } .map { c -> c.getName() }.toList()