From daa16c768bb1dff14b5979468acbe83dbe5dd26a Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Mon, 25 May 2015 18:06:49 +0300
Subject: [PATCH] Fixed package proto for circular dependencies. Case when
 package is present in different modules which depend on each other. We should
 generate separate package facades for this case.

Original commit: 7de531fe09fd10f64b2706fbfe38ce01380f579a
---
 .../kotlin/jps/build/IncrementalJpsTestGenerated.java      | 6 ++++++
 .../circularDependencySamePackageUnchanged/build.log       | 7 +++++++
 .../dependencies.txt                                       | 2 ++
 .../circularDependencySamePackageUnchanged/module1_a.kt    | 7 +++++++
 .../module1_a.kt.new                                       | 7 +++++++
 .../circularDependencySamePackageUnchanged/module2_b.kt    | 7 +++++++
 6 files changed, 36 insertions(+)
 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log
 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt
 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt
 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new
 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt

diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
index 5b7d3b434ea..af9f1e8ce99 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -43,6 +43,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("circularDependencySamePackageUnchanged")
+        public void testCircularDependencySamePackageUnchanged() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/");
+            doTest(fileName);
+        }
+
         @TestMetadata("circularDependencyTopLevelFunctions")
         public void testCircularDependencyTopLevelFunctions() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/");
diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log
new file mode 100644
index 00000000000..d51f6f61402
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log
@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module1/test/TestPackage$module1_a$*.class
+out/production/module1/test/TestPackage.class
+End of files
+Compiling files:
+module1/src/module1_a.kt
+End of files
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt
new file mode 100644
index 00000000000..02d5c8ca1a7
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt
@@ -0,0 +1,2 @@
+module1->module2
+module2->module1
diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt
new file mode 100644
index 00000000000..8311da66012
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt
@@ -0,0 +1,7 @@
+package test
+
+fun a() {
+
+}
+
+val a = ""
diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new
new file mode 100644
index 00000000000..8311da66012
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new
@@ -0,0 +1,7 @@
+package test
+
+fun a() {
+
+}
+
+val a = ""
diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt
new file mode 100644
index 00000000000..b04c387135d
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt
@@ -0,0 +1,7 @@
+package test
+
+fun b() {
+
+}
+
+var b = b()