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: 7de531fe09

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/");

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

jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt

@@ -0,0 +1,2 @@
+module1->module2
+module2->module1

jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt

@@ -0,0 +1,7 @@
+package test
+
+fun a() {
+
+}
+
+val a = ""

jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new

@@ -0,0 +1,7 @@
+package test
+
+fun a() {
+
+}
+
+val a = ""

jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt

@@ -0,0 +1,7 @@
+package test
+
+fun b() {
+
+}
+
+var b = b()