Enabling creating different descriptors for different Java classes

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt

@@ -28,7 +28,6 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaPackageFragmentProvider
 import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaPackageFragment
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass
 import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaClassDescriptor
-import org.jetbrains.jet.lang.resolve.scopes.JetScope
 
 public class LazyJavaPackageFragmentProvider(
         outerContext: GlobalJavaResolverContext,
@@ -67,7 +66,7 @@ public class LazyJavaPackageFragmentProvider(
         }
     }
 
-    internal val topLevelClasses = c.storageManager.createMemoizedFunctionWithNullableValues @lambda {
+    private val topLevelClasses = c.storageManager.createMemoizedFunctionWithNullableValues @lambda {
         (jClass: JavaClass): LazyJavaClassDescriptor? ->
         val fqName = jClass.getFqName()
         if (fqName == null) return@lambda null
@@ -121,18 +120,13 @@ public class LazyJavaPackageFragmentProvider(
                     return c.javaResolverCache.getClassResolvedFromSource(fqName)
                 }
             }
-            val resolvedClassifier = getContainingScope(javaClass)?.getClassifier(javaClass.getName())
-            return resolvedClassifier as? ClassDescriptor ?: c.javaResolverCache.getClass(javaClass)
-        }
-
-        private fun getContainingScope(javaClass: JavaClass): JetScope? {
             val outerClass = javaClass.getOuterClass()
-            if (outerClass != null) {
+            if (outerClass == null) {
-                return resolveClass(outerClass)?.getUnsubstitutedInnerClassesScope()
+                return c.lookupBinaryClass(javaClass) ?: topLevelClasses(javaClass)
-            }
-            else {
-                return getPackageFragment(javaClass.getFqName()!!.parent())?.getMemberScope()
             }
+            val outerClassScope = resolveClass(outerClass)?.getUnsubstitutedInnerClassesScope()
+            val nestedClass = outerClassScope?.getClassifier(javaClass.getName()) as? ClassDescriptor
+            return nestedClass ?: c.javaResolverCache.getClass(javaClass)
         }
 
         override fun resolveClassByFqName(fqName: FqName): ClassDescriptor? {

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt

@@ -55,7 +55,7 @@ public abstract class LazyJavaPackageFragmentScope(
             if (cached != null)
                 cached
             else {
-                val classDescriptor = c.packageFragmentProvider.topLevelClasses(jClass)
+                val classDescriptor = c.javaClassResolver.resolveClass(jClass)
                 assert(classDescriptor == null || classDescriptor.getContainingDeclaration() == packageFragment,
                        "Wrong package fragment for $classDescriptor, expected $packageFragment")
                 classDescriptor