diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index b3da1e07334..d712367a8f0 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -389,6 +389,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("inlinePrivateFunctionAdded") + public void testInlinePrivateFunctionAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); 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 2e2da5f5f72..4147bcbd732 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 @@ -389,6 +389,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlinePrivateFunctionAdded") + public void testInlinePrivateFunctionAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log new file mode 100644 index 00000000000..2320b705b27 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class +End of files +Compiling files: + src/other.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log new file mode 100644 index 00000000000..b908417e51c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt new file mode 100644 index 00000000000..f573f09d977 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt @@ -0,0 +1,10 @@ +package foo + +fun test() { + oldInlineFun() +} + +inline +private fun oldInlineFun() { + println("oldInlineFun") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new new file mode 100644 index 00000000000..c1fcbf02c30 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new @@ -0,0 +1,16 @@ +package foo + +inline +private fun newInlineFun() { + println("newInlineFun") +} + +fun test() { + newInlineFun() + oldInlineFun() +} + +inline +private fun oldInlineFun() { + println("oldInlineFun") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file