Fix: not loading ancestor packages from incremental cache.

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt

@@ -56,6 +56,7 @@ public class IncrementalPackageFragmentProvider(
             ).toSet()
     val fqNameToSubFqNames = MultiMap<FqName, FqName>()
     val fqNameToPackageFragment = HashMap<FqName, PackageFragmentDescriptor>()
+    val fqNamesToLoad: Set<FqName>
 
     ;{
         fun createPackageFragment(fqName: FqName) {
@@ -72,13 +73,12 @@ public class IncrementalPackageFragmentProvider(
             fqNameToPackageFragment[fqName] = IncrementalPackageFragment(fqName)
         }
 
-        for (source in PackagePartClassUtils.getPackageFilesWithCallables(sourceFiles)) {
+        fqNamesToLoad = (
-            createPackageFragment(source.getPackageFqName())
+                PackagePartClassUtils.getPackageFilesWithCallables(sourceFiles).map { it.getPackageFqName() }
-        }
+                + incrementalCache.getPackagesWithRemovedFiles(sourceFiles)
+        ).toSet()
 
-        for (fqName in incrementalCache.getPackagesWithRemovedFiles(sourceFiles)) {
+        fqNamesToLoad.forEach { createPackageFragment(it) }
-            createPackageFragment(fqName)
-        }
     }
 
     override fun getSubPackagesOf(fqName: FqName): Collection<FqName> {
@@ -95,12 +95,17 @@ public class IncrementalPackageFragmentProvider(
             get() = this@IncrementalPackageFragmentProvider.moduleId
 
         val _memberScope: NotNullLazyValue<JetScope> = storageManager.createLazyValue {
-            val packageDataBytes = incrementalCache.getPackageData(fqName)
+            if (fqName !in fqNamesToLoad) {
-            if (packageDataBytes == null) {
                 JetScope.EMPTY
             }
             else {
-                IncrementalPackageScope(JavaProtoBufUtil.readPackageDataFrom(packageDataBytes))
+                val packageDataBytes = incrementalCache.getPackageData(fqName)
+                if (packageDataBytes == null) {
+                    JetScope.EMPTY
+                }
+                else {
+                    IncrementalPackageScope(JavaProtoBufUtil.readPackageDataFrom(packageDataBytes))
+                }
             }
         }
 

jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java

@@ -275,6 +275,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
         
+        @TestMetadata("subpackage")
+        public void testSubpackage() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/");
+            doTest(fileName);
+        }
+        
         @TestMetadata("topLevelFunctionSameSignature")
         public void testTopLevelFunctionSameSignature() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/");

jps-plugin/testData/incremental/pureKotlin/subpackage/build.log

@@ -0,0 +1,8 @@
+Cleaning output files:
+out/production/module/outer/nested/NestedPackage$main$1.class
+out/production/module/outer/nested/NestedPackage-nested-*.class
+out/production/module/outer/nested/NestedPackage.class
+End of files
+Compiling files:
+src/nested.kt
+End of files

jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt

@@ -0,0 +1,12 @@
+package outer.nested
+
+import outer.f
+
+fun g() {
+}
+
+fun main(args: Array<String>) {
+    f { }
+    g()
+}
+

jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new

@@ -0,0 +1,12 @@
+package outer.nested
+
+import outer.f
+
+fun g() {
+}
+
+fun main(args: Array<String>) {
+    f { }
+    g()
+}
+

jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt

@@ -0,0 +1,7 @@
+package outer
+
+fun f(c: () -> Unit) {
+}
+
+fun <T> f(c: () -> T): String = ""
+