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 92823c69b89..ba638ed4bbd 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 @@ -281,6 +281,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineFunction") + public void testInlineFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunction/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); @@ -299,6 +305,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineTwoFunctionsOneChanged") + public void testInlineTwoFunctionsOneChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); + doTest(fileName); + } + @TestMetadata("localClassChanged") public void testLocalClassChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log new file mode 100644 index 00000000000..1fa543e2cc6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsagePackage$usesInline$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usesInline.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt new file mode 100644 index 00000000000..c0f66d312a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(body: () -> Unit) { + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new new file mode 100644 index 00000000000..80d71e901a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt new file mode 100644 index 00000000000..1de875e529a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + test() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt new file mode 100644 index 00000000000..5e87e229853 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt @@ -0,0 +1,5 @@ +package usage + +fun test() { + inline.f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log new file mode 100644 index 00000000000..793ddfbc22e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsagePackage$usesG$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usesG.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt new file mode 100644 index 00000000000..a07b33dfcec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt @@ -0,0 +1,9 @@ +package inline + +inline fun f() { + println("inline.f") +} + +inline fun g() { + println("inline.g") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new new file mode 100644 index 00000000000..7240b129efe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new @@ -0,0 +1,9 @@ +package inline + +inline fun f() { + println("inline.f") +} + +inline fun g() { + println("inline.g changed") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt new file mode 100644 index 00000000000..12833a24b04 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt @@ -0,0 +1,5 @@ +package usage + +fun testF() { + inline.f() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt new file mode 100644 index 00000000000..a24221d378a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt @@ -0,0 +1,5 @@ +package usage + +fun testG() { + inline.g() +}