From 30bccc431bf4e02a68d899ed129f9747543591cf Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 22 Jan 2020 06:45:21 +0300 Subject: [PATCH] Migrate tests to release coroutines where it's not essential to use experimental ones #KT-36083 --- .../decompiler/stubBuilder/Modifiers/Modifiers.kt | 2 +- .../decompiler/stubBuilder/Modifiers/Modifiers.txt | 6 ++---- .../inlineFunCallSite/coroutine/directives.txt | 1 - .../incremental/inlineFunCallSite/coroutine/usage.kt | 10 ++++------ 4 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 jps-plugin/testData/incremental/inlineFunCallSite/coroutine/directives.txt diff --git a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt index 9cad5742656..f59daea86a3 100644 --- a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt +++ b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.kt @@ -1,5 +1,5 @@ package test -import kotlin.coroutines.experimental.* +import kotlin.coroutines.* data class Modifiers(val x: Int) { external fun extFun() diff --git a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt index bcaf94883ab..e0aecc64b88 100644 --- a/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt +++ b/idea/testData/decompiler/stubBuilder/Modifiers/Modifiers.txt @@ -139,10 +139,8 @@ PsiJetFileStubImpl[package=test] USER_TYPE USER_TYPE USER_TYPE - USER_TYPE - REFERENCE_EXPRESSION[referencedName=kotlin] - REFERENCE_EXPRESSION[referencedName=coroutines] - REFERENCE_EXPRESSION[referencedName=experimental] + REFERENCE_EXPRESSION[referencedName=kotlin] + REFERENCE_EXPRESSION[referencedName=coroutines] REFERENCE_EXPRESSION[referencedName=Continuation] TYPE_ARGUMENT_LIST TYPE_PROJECTION[projectionKind=NONE] diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/directives.txt b/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/directives.txt deleted file mode 100644 index 5099b2ad971..00000000000 --- a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/directives.txt +++ /dev/null @@ -1 +0,0 @@ -// IGNORE_BACKEND: JVM_IR diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt index c6e11a28ed8..36035eab76d 100644 --- a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt +++ b/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt @@ -1,18 +1,16 @@ package usage -import kotlin.coroutines.experimental.* -import kotlin.coroutines.experimental.intrinsics.* +import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun async(x: suspend Controller.() -> Unit) { x.startCoroutine(Controller(), object : Continuation { override val context: CoroutineContext = null!! - override fun resume(value: Unit) {} - - override fun resumeWithException(exception: Throwable) {} + override fun resumeWith(result: Result) {} }) } class Controller { - suspend fun step(param: Int) = suspendCoroutineOrReturn { next -> + suspend fun step(param: Int) = suspendCoroutineUninterceptedOrReturn { next -> next.resume(param + 1) } }