From 7d61a2de73a739493aaa94f9f5faa9a0335528b5 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 17 Nov 2018 00:45:03 +0300 Subject: [PATCH] Reformat coroutine sources --- .../coroutines/js/internal/CoroutineImpl.kt | 4 ++-- .../jvm/internal/ContinuationImpl.kt | 4 ++-- .../coroutines/jvm/internal/RunSuspend.kt | 2 +- .../stdlib/coroutines/src/kotlin/Result.kt | 18 ++++++++++-------- .../src/kotlin/coroutines/Continuation.kt | 10 ++++++---- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/libraries/stdlib/coroutines/js/src/kotlin/coroutines/js/internal/CoroutineImpl.kt b/libraries/stdlib/coroutines/js/src/kotlin/coroutines/js/internal/CoroutineImpl.kt index 429e0258499..d06c83588ae 100644 --- a/libraries/stdlib/coroutines/js/src/kotlin/coroutines/js/internal/CoroutineImpl.kt +++ b/libraries/stdlib/coroutines/js/src/kotlin/coroutines/js/internal/CoroutineImpl.kt @@ -22,8 +22,8 @@ internal abstract class CoroutineImpl(private val resultContinuation: Continuati public fun intercepted(): Continuation = intercepted_ - ?: (context[ContinuationInterceptor]?.interceptContinuation(this) ?: this) - .also { intercepted_ = it } + ?: (context[ContinuationInterceptor]?.interceptContinuation(this) ?: this) + .also { intercepted_ = it } override fun resumeWith(result: Result) { var current = this diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt index 9d8c2eb1e8f..3482f5bf136 100644 --- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt +++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/ContinuationImpl.kt @@ -67,7 +67,7 @@ internal abstract class BaseContinuationImpl( "Continuation at ${getStackTraceElement() ?: this::class.java.name}" // --- CoroutineStackFrame implementation - + public override val callerFrame: CoroutineStackFrame? get() = completion as? CoroutineStackFrame @@ -101,7 +101,7 @@ internal abstract class ContinuationImpl( constructor(completion: Continuation?) : this(completion, completion?.context) public override val context: CoroutineContext - get() = _context!! + get() = _context!! @Transient private var intercepted: Continuation? = null diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/RunSuspend.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/RunSuspend.kt index a9ecd0f9355..5921d60185d 100644 --- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/RunSuspend.kt +++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/RunSuspend.kt @@ -11,7 +11,7 @@ import kotlin.coroutines.EmptyCoroutineContext import kotlin.coroutines.startCoroutine /** - * Wrapper for `suspend fun main` and `@Test suspend fun testXXX` functions. + * Wrapper for `suspend fun main` and `@Test suspend fun testXXX` functions. */ @SinceKotlin("1.3") internal fun runSuspend(block: suspend () -> Unit) { diff --git a/libraries/stdlib/coroutines/src/kotlin/Result.kt b/libraries/stdlib/coroutines/src/kotlin/Result.kt index 37bc88533af..828b6712e16 100644 --- a/libraries/stdlib/coroutines/src/kotlin/Result.kt +++ b/libraries/stdlib/coroutines/src/kotlin/Result.kt @@ -84,13 +84,15 @@ public inline class Result @PublishedApi internal constructor( /** * Returns an instance that encapsulates the given [value] as successful value. */ - @InlineOnly public inline fun success(value: T): Result = + @InlineOnly + public inline fun success(value: T): Result = Result(value) /** * Returns an instance that encapsulates the given [exception] as failure. */ - @InlineOnly public inline fun failure(exception: Throwable): Result = + @InlineOnly + public inline fun failure(exception: Throwable): Result = Result(createFailure(exception)) } @@ -181,7 +183,7 @@ public inline fun Result.getOrElse(onFailure: (exception: Throwabl contract { callsInPlace(onFailure, InvocationKind.AT_MOST_ONCE) } - return when(val exception = exceptionOrNull()) { + return when (val exception = exceptionOrNull()) { null -> value as T else -> onFailure(exception) } @@ -216,7 +218,7 @@ public inline fun Result.fold( callsInPlace(onSuccess, InvocationKind.AT_MOST_ONCE) callsInPlace(onFailure, InvocationKind.AT_MOST_ONCE) } - return when(val exception = exceptionOrNull()) { + return when (val exception = exceptionOrNull()) { null -> onSuccess(value as T) else -> onFailure(exception) } @@ -271,11 +273,11 @@ public inline fun Result.mapCatching(transform: (value: T) -> R): Resu */ @InlineOnly @SinceKotlin("1.3") -public inline fun Result.recover(transform: (exception: Throwable) -> R): Result { +public inline fun Result.recover(transform: (exception: Throwable) -> R): Result { contract { callsInPlace(transform, InvocationKind.AT_MOST_ONCE) } - return when(val exception = exceptionOrNull()) { + return when (val exception = exceptionOrNull()) { null -> this else -> Result.success(transform(exception)) } @@ -291,9 +293,9 @@ public inline fun Result.recover(transform: (exception: Throwable) */ @InlineOnly @SinceKotlin("1.3") -public inline fun Result.recoverCatching(transform: (exception: Throwable) -> R): Result { +public inline fun Result.recoverCatching(transform: (exception: Throwable) -> R): Result { val value = value // workaround for inline classes BE bug - return when(val exception = exceptionOrNull()) { + return when (val exception = exceptionOrNull()) { null -> this else -> runCatching { transform(exception) } } diff --git a/libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt b/libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt index 295905b4da3..2fc11cf4816 100644 --- a/libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt +++ b/libraries/stdlib/coroutines/src/kotlin/coroutines/Continuation.kt @@ -7,7 +7,6 @@ package kotlin.coroutines import kotlin.coroutines.intrinsics.* import kotlin.internal.InlineOnly -import kotlin.jvm.JvmName /** * Interface representing a continuation after a suspension point that returns value of type `T`. @@ -40,7 +39,8 @@ public annotation class RestrictsSuspension * Resumes the execution of the corresponding coroutine passing [value] as the return value of the last suspension point. */ @SinceKotlin("1.3") -@InlineOnly public inline fun Continuation.resume(value: T): Unit = +@InlineOnly +public inline fun Continuation.resume(value: T): Unit = resumeWith(Result.success(value)) /** @@ -48,7 +48,8 @@ public annotation class RestrictsSuspension * last suspension point. */ @SinceKotlin("1.3") -@InlineOnly public inline fun Continuation.resumeWithException(exception: Throwable): Unit = +@InlineOnly +public inline fun Continuation.resumeWithException(exception: Throwable): Unit = resumeWith(Result.failure(exception)) @@ -56,7 +57,8 @@ public annotation class RestrictsSuspension * Creates [Continuation] instance with a given [context] and a given implementation of [resumeWith] method. */ @SinceKotlin("1.3") -@InlineOnly public inline fun Continuation( +@InlineOnly +public inline fun Continuation( context: CoroutineContext, crossinline resumeWith: (Result) -> Unit ): Continuation =