Fix incremental recompilation of JvmMultifileClass with top level function
See 7a679eb and previous changes where this behavior was broken (this was
untested, however). Fixes EA-90065
Original commit: 7b2a80ffa4
This commit is contained in:
+6
@@ -581,6 +581,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
|
|||||||
doTest(fileName);
|
doTest(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("multifileClassAddTopLevelFunWithDefault")
|
||||||
|
public void testMultifileClassAddTopLevelFunWithDefault() throws Exception {
|
||||||
|
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/");
|
||||||
|
doTest(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("multifileClassFileAdded")
|
@TestMetadata("multifileClassFileAdded")
|
||||||
public void testMultifileClassFileAdded() throws Exception {
|
public void testMultifileClassFileAdded() throws Exception {
|
||||||
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/");
|
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/");
|
||||||
|
|||||||
+6
@@ -581,6 +581,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
|
|||||||
doTest(fileName);
|
doTest(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("multifileClassAddTopLevelFunWithDefault")
|
||||||
|
public void testMultifileClassAddTopLevelFunWithDefault() throws Exception {
|
||||||
|
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/");
|
||||||
|
doTest(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("multifileClassFileAdded")
|
@TestMetadata("multifileClassFileAdded")
|
||||||
public void testMultifileClassFileAdded() throws Exception {
|
public void testMultifileClassFileAdded() throws Exception {
|
||||||
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/");
|
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/");
|
||||||
|
|||||||
+4
@@ -0,0 +1,4 @@
|
|||||||
|
@file:[JvmName("Test") JvmMultifileClass]
|
||||||
|
package test
|
||||||
|
|
||||||
|
fun a() = "a"
|
||||||
+4
@@ -0,0 +1,4 @@
|
|||||||
|
@file:[JvmName("Test") JvmMultifileClass]
|
||||||
|
package test
|
||||||
|
|
||||||
|
fun b() = ""
|
||||||
+5
@@ -0,0 +1,5 @@
|
|||||||
|
@file:[JvmName("Test") JvmMultifileClass]
|
||||||
|
package test
|
||||||
|
|
||||||
|
fun b() = ""
|
||||||
|
fun b(s: String = "") = s
|
||||||
+24
@@ -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
|
||||||
|
------------------------------------------
|
||||||
+26
@@ -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
|
||||||
|
------------------------------------------
|
||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
package usage
|
||||||
|
|
||||||
|
import test.*
|
||||||
|
|
||||||
|
fun usage() {
|
||||||
|
a()
|
||||||
|
b()
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user