diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt index 396c9178bd4..18bc4459cd5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaSubModule.kt @@ -54,8 +54,8 @@ public open class LazyJavaSubModule( override fun getPackageFragment(fqName: FqName) = _packageFragments(fqName) override fun getPackageFragments(fqName: FqName) = getPackageFragment(fqName)?.let {listOf(it)} ?: listOf() - override fun getSubPackagesOf(fqName: FqName) = listOf() // TODO - override fun getClassNamesInPackage(packageName: FqName) = listOf() // TODO + override fun getSubPackagesOf(fqName: FqName) = listOf() // TODO + override fun getClassNamesInPackage(packageName: FqName) = listOf() // TODO fun getClass(fqName: FqName): ClassDescriptor? = c.javaClassResolver.resolveClassByFqName(fqName) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt index 7acd5493c36..ed7c761224f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt @@ -14,6 +14,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor import org.jetbrains.jet.lang.types.TypeSubstitutor import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptor import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver +import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider abstract class LazyJavaPackageFragment( private val c: LazyJavaResolverContext, @@ -27,6 +28,8 @@ abstract class LazyJavaPackageFragment( override fun getJavaDescriptorResolver(): JavaDescriptorResolver = c.javaDescriptorResolver + override fun getProvider(): PackageFragmentProvider = c.subModule + override fun accept(visitor: DeclarationDescriptorVisitor, data: D) = visitor.visitPackageFragmentDescriptor(this, data) as R override fun substitute(substitutor: TypeSubstitutor) = this @@ -42,6 +45,8 @@ public class LazyPackageFragmentForJavaPackage( override fun getFqName(): FqName = jPackage.getFqName() override val _memberScope = LazyPackageFragmentScopeForJavaPackage(c, jPackage, this) + + override fun getKind() = JavaPackageFragmentDescriptor.Kind.PROPER } public class LazyPackageFragmentForJavaClass( @@ -55,4 +60,6 @@ public class LazyPackageFragmentForJavaClass( override fun getFqName(): FqName = jClass.getFqName()!! override val _memberScope = LazyPackageFragmentScopeForJavaClass(c, jClass, this) + + override fun getKind() = JavaPackageFragmentDescriptor.Kind.CLASS_STATICS } \ No newline at end of file