diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 47103158ce6..9cfdae0f0f9 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -581,6 +581,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta 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/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 27ef2946781..813be4e36f3 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -581,6 +581,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { 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/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt new file mode 100644 index 00000000000..63a63e173a0 --- /dev/null +++ b/jps/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/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt new file mode 100644 index 00000000000..dcb3f87f413 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new new file mode 100644 index 00000000000..1aa2c839861 --- /dev/null +++ b/jps/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/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log new file mode 100644 index 00000000000..582ead1c07f --- /dev/null +++ b/jps/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 +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log new file mode 100644 index 00000000000..b13957b6b52 --- /dev/null +++ b/jps/jps-plugin/testData/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 +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt new file mode 100644 index 00000000000..7b1bf24bdd1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt @@ -0,0 +1,8 @@ +package usage + +import test.* + +fun usage() { + a() + b() +}