From a783bf14cbddeec20ef3106e24ea617751259b47 Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Thu, 1 Nov 2018 20:23:45 +0300 Subject: [PATCH] JS: report inline suspend functions to IC * Also inline suspend lambda'a * Also use correct JsName's in exported suspend inline fun's * Also use less unused imports Original commit: 59009430e5212cc7a8bcc18b1ddc2b6e1a810c73 --- .../build/IncrementalJpsTestGenerated.java | 5 +++++ .../inlineSuspendFunctionChanged/build.log | 22 +++++++++++++++++++ .../inlineSuspendFunctionChanged/dummy.kt | 5 +++++ .../inlineSuspendFunctionChanged/inline.kt | 6 +++++ .../inline.kt.new | 6 +++++ .../inlineSuspendFunctionChanged/useInline.kt | 5 +++++ 6 files changed, 49 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt 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 3c17d3546d7..47155dc92c3 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 @@ -870,6 +870,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { runTest("jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/"); } + @TestMetadata("inlineSuspendFunctionChanged") + public void testInlineSuspendFunctionChanged() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/"); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log new file mode 100644 index 00000000000..cbce054c33e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/useInline.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/UseInlineKt.class +End of files +Compiling files: + src/useInline.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt new file mode 100644 index 00000000000..e3a7cc6b3fc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt @@ -0,0 +1,5 @@ +package inline + +fun dontUseF() { + println("Don't use f") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt new file mode 100644 index 00000000000..68613324f2d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt @@ -0,0 +1,6 @@ +package inline + +inline suspend fun f(body: () -> Unit) { + println("i'm inline suspend function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new new file mode 100644 index 00000000000..0858af3d7cf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new @@ -0,0 +1,6 @@ +package inline + +inline suspend fun f(body: () -> Unit) { + body() + println("i'm inline suspend function") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt new file mode 100644 index 00000000000..370f5a8a595 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt @@ -0,0 +1,5 @@ +package inline + +suspend fun useF() { + f { println("useF") } +}