Fix incremental recompilation of JvmMultifileClass with top level fun…

…ction See 53b584f and previous changes where this behavior was broken (this was untested, however). Fixes EA-90065 (cherry picked from commit 7b2a80f)
JetBrains · Oct 19, 2016 · 379239c · 379239c
1 parent 88f5269
commit 379239c
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 8 deletions.
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
@@ -50,6 +50,7 @@
 import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor;
 import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment;
 import org.jetbrains.kotlin.load.kotlin.*;
+import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider.IncrementalMultifileClassPackageFragment;
 import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.Name;
@@ -295,18 +296,27 @@ private static ContainingClassesInfo getPackageMemberContainingClassesInfo(@NotN
             return new ContainingClassesInfo(FAKE_CLASS_ID_FOR_BUILTINS, FAKE_CLASS_ID_FOR_BUILTINS);
         }
 
-        assert containingDeclaration instanceof LazyJavaPackageFragment :
-                "Unexpected package fragment for " + descriptor + ": " + containingDeclaration +
-                " (" + containingDeclaration.getClass().getSimpleName() + ")";
-        LazyJavaPackageFragment packageFragment = (LazyJavaPackageFragment) containingDeclaration;
-
         Name implClassName = JvmFileClassUtil.getImplClassName(descriptor);
         assert implClassName != null : "No implClassName for " + descriptor;
+        String implSimpleName = implClassName.asString();
 
-        String facadeSimpleName = packageFragment.getFacadeSimpleNameForPartSimpleName(implClassName.asString());
-        if (facadeSimpleName == null) return null;
+        String facadeSimpleName;
 
-        return ContainingClassesInfo.forPackageMember(packageFragment.getFqName(), facadeSimpleName, implClassName.asString());
+        if (containingDeclaration instanceof LazyJavaPackageFragment) {
+            facadeSimpleName = ((LazyJavaPackageFragment) containingDeclaration).getFacadeSimpleNameForPartSimpleName(implSimpleName);
+            if (facadeSimpleName == null) return null;
+        }
+        else if (containingDeclaration instanceof IncrementalMultifileClassPackageFragment) {
+            facadeSimpleName = ((IncrementalMultifileClassPackageFragment) containingDeclaration).getMultifileClassName().asString();
+        }
+        else {
+            throw new AssertionError("Unexpected package fragment for " + descriptor + ": " +
+                                     containingDeclaration + " (" + containingDeclaration.getClass().getSimpleName() + ")");
+        }
+
+        return ContainingClassesInfo.forPackageMember(
+                ((PackageFragmentDescriptor) containingDeclaration).getFqName(), facadeSimpleName, implSimpleName
+        );
     }
 
     @NotNull

diff --git a/...va/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/...va/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
@@ -93,6 +93,9 @@ class IncrementalPackageFragmentProvider(
             )
         }
 
+        val multifileClassName: Name
+            get() = multifileClassFqName.shortName()
+
         override fun getMemberScope() = memberScope()
     }
 }
diff --git a/...ps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/...ps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
@@ -581,6 +581,12 @@ public void testMoveFileWithoutChangingPackage() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("multifileClassAddTopLevelFunWithDefault")
+        public void testMultifileClassAddTopLevelFunWithDefault() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/");
+            doTest(fileName);
+        }
+
         @TestMetadata("multifileClassFileAdded")
         public void testMultifileClassFileAdded() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/");

diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -581,6 +581,12 @@ public void testMoveFileWithoutChangingPackage() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("multifileClassAddTopLevelFunWithDefault")
+        public void testMultifileClassAddTopLevelFunWithDefault() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/");
+            doTest(fileName);
+        }
+
         @TestMetadata("multifileClassFileAdded")
         public void testMultifileClassFileAdded() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/");

diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt b/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt
@@ -0,0 +1,4 @@
+@file:[JvmName("Test") JvmMultifileClass]
+package test
+
+fun a() = "a"
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt b/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt
@@ -0,0 +1,4 @@
+@file:[JvmName("Test") JvmMultifileClass]
+package test
+
+fun b() = ""
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new b/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new
@@ -0,0 +1,5 @@
+@file:[JvmName("Test") JvmMultifileClass]
+package test
+
+fun b() = ""
+fun b(s: String = "") = s
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log b/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log
@@ -0,0 +1,24 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Test.class
+  out/production/module/test/Test__BKt.class
+End of files
+Compiling files:
+  src/b.kt
+End of files
+Exit code: ADDITIONAL_PASS_REQUIRED
+------------------------------------------
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Test.class
+  out/production/module/test/Test__AKt.class
+  out/production/module/usage/UsageKt.class
+End of files
+Compiling files:
+  src/a.kt
+  src/usage.kt
+End of files
+Exit code: OK
+------------------------------------------
diff --git a/.../incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log b/.../incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log
@@ -0,0 +1,26 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Test.class
+  out/production/module/test/Test__BKt.class
+End of files
+Compiling files:
+  src/b.kt
+End of files
+Marked as dirty by Kotlin:
+  src/usage.kt
+Exit code: ADDITIONAL_PASS_REQUIRED
+------------------------------------------
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Test.class
+  out/production/module/test/Test__AKt.class
+  out/production/module/usage/UsageKt.class
+End of files
+Compiling files:
+  src/a.kt
+  src/usage.kt
+End of files
+Exit code: OK
+------------------------------------------
diff --git a/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt b/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt
@@ -0,0 +1,8 @@
+package usage
+
+import test.*
+
+fun usage() {
+    a()
+    b()
+}