From f971cc5f9704b14b0fe914b3a1647e364c51138a Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 19 Sep 2014 16:12:25 +0400
Subject: [PATCH] Fix: not loading ancestor packages from incremental cache.

Original commit: b435904d7f2f9576fadab3c157abca57f4115d07
---
 .../jet/jps/build/IncrementalJpsTestGenerated.java   |  6 ++++++
 .../incremental/pureKotlin/subpackage/build.log      |  8 ++++++++
 .../incremental/pureKotlin/subpackage/nested.kt      | 12 ++++++++++++
 .../incremental/pureKotlin/subpackage/nested.kt.new  | 12 ++++++++++++
 .../incremental/pureKotlin/subpackage/outer.kt       |  7 +++++++
 5 files changed, 45 insertions(+)
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt

diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
index 8d569fc5a76..2fae1f59adf 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/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/");
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log
new file mode 100644
index 00000000000..ca0056732d4
--- /dev/null
+++ b/jps/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
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt
new file mode 100644
index 00000000000..35287cfaf30
--- /dev/null
+++ b/jps/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()
+}
+
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new
new file mode 100644
index 00000000000..35287cfaf30
--- /dev/null
+++ b/jps/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()
+}
+
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt
new file mode 100644
index 00000000000..83ddfc54f1e
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt
@@ -0,0 +1,7 @@
+package outer
+
+fun f(c: () -> Unit) {
+}
+
+fun <T> f(c: () -> T): String = ""
+