AbsractCoroutine moved to common module

Author: elizarov

core/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/AbstractCoroutine.kt renamed to common/kotlinx-coroutines-core-common/src/main/kotlin/kotlinx/coroutines/experimental/AbstractCoroutine.kt

@@ -24,4 +24,5 @@ public expect object Unconfined : CoroutineDispatcher {
 }
 
 internal expect inline fun <T> withCoroutineContext(context: CoroutineContext, block: () -> T): T
-internal expect fun Continuation<*>.toDebugString(): String
+internal expect fun Continuation<*>.toDebugString(): String
+internal expect val CoroutineContext.coroutineName: String?

common/kotlinx-coroutines-core-common/src/main/kotlin/kotlinx/coroutines/experimental/CommonCoroutineContext.kt

@@ -59,3 +59,31 @@ public expect suspend fun Job.joinChildren()
 public expect object NonDisposableHandle : DisposableHandle {
     override fun dispose()
 }
+
+internal expect open class JobSupport(active: Boolean) : Job {
+    public final override val key: CoroutineContext.Key<*>
+    public final override val isActive: Boolean
+    public final override val isCompleted: Boolean
+    public final override val isCancelled: Boolean
+
+    public final override fun getCancellationException(): CancellationException
+    public final override fun start(): Boolean
+    public final override fun cancel(cause: Throwable?): Boolean
+    public final override val children: Sequence<Job>
+
+    public final override fun attachChild(child: Job): DisposableHandle
+    public final override suspend fun join()
+    public final override fun invokeOnCompletion(
+        onCancelling: Boolean,
+        invokeImmediately: Boolean,
+        handler: CompletionHandler
+    ): DisposableHandle
+
+    internal fun initParentJobInternal(parent: Job?)
+    internal fun makeCompletingOnce(proposedUpdate: Any?, mode: Int): Boolean
+    internal open fun afterCompletion(state: Any?, mode: Int)
+    internal open fun onStartInternal()
+    internal open fun onCancellationInternal(exceptionally: CompletedExceptionally?)
+    internal open fun nameString(): String
+    internal open fun handleException(exception: Throwable)
+}

common/kotlinx-coroutines-core-common/src/main/kotlin/kotlinx/coroutines/experimental/CommonJob.kt

@@ -130,7 +130,7 @@ internal fun CoroutineContext.updateThreadContext(): String? {
     return oldName
 }
 
-internal val CoroutineContext.coroutineName: String? get() {
+internal actual val CoroutineContext.coroutineName: String? get() {
     if (!DEBUG) return null
     val coroutineId = this[CoroutineId] ?: return null
     val coroutineName = this[CoroutineName]?.name ?: "coroutine"

core/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/intrinsics/Undispatched.kt renamed to common/kotlinx-coroutines-core-common/src/main/kotlin/kotlinx/coroutines/experimental/intrinsics/Undispatched.kt

@@ -24,7 +24,6 @@ import kotlinx.coroutines.experimental.internal.OpDescriptor
 import kotlinx.coroutines.experimental.internal.unwrap
 import kotlinx.coroutines.experimental.intrinsics.startCoroutineUndispatched
 import kotlinx.coroutines.experimental.selects.SelectClause0
-import kotlinx.coroutines.experimental.selects.SelectClause1
 import kotlinx.coroutines.experimental.selects.SelectInstance
 import kotlinx.coroutines.experimental.selects.select
 import java.util.concurrent.Future
@@ -525,8 +524,8 @@ public actual object NonDisposableHandle : DisposableHandle {
  * @param active when `true` the job is created in _active_ state, when `false` in _new_ state. See [Job] for details.
  * @suppress **This is unstable API and it is subject to change.**
  */
-internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
-    override val key: CoroutineContext.Key<*> get() = Job
+internal actual open class JobSupport actual constructor(active: Boolean) : Job, SelectClause0 {
+    actual final override val key: CoroutineContext.Key<*> get() = Job
 
     /*
        === Internal states ===
@@ -598,7 +597,7 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
      * It shall be invoked at most once after construction after all other initialization.
      * @suppress **This is unstable API and it is subject to change.**
      */
-    internal fun initParentJobInternal(parent: Job?) {
+    internal actual fun initParentJobInternal(parent: Job?) {
         check(parentHandle == null)
         if (parent == null) {
             parentHandle = NonDisposableHandle
@@ -637,14 +636,14 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
         }
     }
 
-    public final override val isActive: Boolean get() {
+    public actual final override val isActive: Boolean get() {
         val state = this.state
         return state is Incomplete && state.isActive
     }
 
-    public final override val isCompleted: Boolean get() = state !is Incomplete
+    public actual final override val isCompleted: Boolean get() = state !is Incomplete
 
-    public final override val isCancelled: Boolean get() {
+    public actual final override val isCancelled: Boolean get() {
         val state = this.state
         return state is Cancelled || (state is Finishing && state.cancelled != null)
     }
@@ -741,7 +740,7 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
     private fun notifyCancellation(list: NodeList, cause: Throwable?) =
         notifyHandlers<JobCancellationNode<*>>(list, cause)
 
-    public final override fun start(): Boolean {
+    public actual final override fun start(): Boolean {
         loopOnState { state ->
             when (startInternal(state)) {
                 FALSE -> return false
@@ -775,9 +774,9 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
      * Override to provide the actual [start] action.
      * This function is invoked exactly once when non-active coroutine is [started][start].
      */
-    internal open fun onStartInternal() {}
+    internal actual open fun onStartInternal() {}
 
-    public final override fun getCancellationException(): CancellationException {
+    public actual final override fun getCancellationException(): CancellationException {
         val state = this.state
         return when {
             state is Finishing && state.cancelled != null ->
@@ -822,7 +821,7 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
     public final override fun invokeOnCompletion(onCancelling_: Boolean, handler: CompletionHandler): DisposableHandle =
         invokeOnCompletion(onCancelling = onCancelling_, invokeImmediately = true, handler = handler)
 
-    public final override fun invokeOnCompletion(
+    public actual final override fun invokeOnCompletion(
         onCancelling: Boolean,
         invokeImmediately: Boolean,
         handler: CompletionHandler
@@ -888,7 +887,7 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
         _state.compareAndSet(state, list)
     }
 
-    public final override suspend fun join() {
+    public actual final override suspend fun join() {
         if (!joinInternal()) { // fast-path no wait
             return suspendCoroutineOrReturn { cont ->
                 cont.context.checkCompletion()
@@ -960,7 +959,7 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
      */
     internal open val onCancelMode: Int get() = ON_CANCEL_MAKE_CANCELLING
 
-    public override fun cancel(cause: Throwable?): Boolean = when (onCancelMode) {
+    public actual override fun cancel(cause: Throwable?): Boolean = when (onCancelMode) {
         ON_CANCEL_MAKE_CANCELLED -> makeCancelled(cause)
         ON_CANCEL_MAKE_CANCELLING -> makeCancelling(cause)
         ON_CANCEL_MAKE_COMPLETING -> makeCompletingOnCancel(cause)
@@ -1045,7 +1044,7 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
      * @throws IllegalStateException if job is already complete or completing
      * @suppress **This is unstable API and it is subject to change.**
      */
-    internal fun makeCompletingOnce(proposedUpdate: Any?, mode: Int): Boolean =
+    internal actual fun makeCompletingOnce(proposedUpdate: Any?, mode: Int): Boolean =
         when (makeCompletingInternal(proposedUpdate, mode)) {
             COMPLETING_COMPLETED -> true
             COMPLETING_WAITING_CHILDREN -> false
@@ -1128,7 +1127,7 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
         }
     }
 
-    public final override val children: Sequence<Job> get() = buildSequence {
+    public actual final override val children: Sequence<Job> get() = buildSequence {
         val state = this@JobSupport.state
         when (state) {
             is Child -> yield(state.childJob)
@@ -1139,7 +1138,7 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
     }
 
     @Suppress("OverridingDeprecatedMember")
-    public final override fun attachChild(child: Job): DisposableHandle =
+    public actual final override fun attachChild(child: Job): DisposableHandle =
         invokeOnCompletion(onCancelling = true, handler = Child(this, child))
 
     @Suppress("OverridingDeprecatedMember")
@@ -1150,8 +1149,9 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
     /**
      * Override to process any exceptions that were encountered while invoking completion handlers
      * installed via [invokeOnCompletion].
+     * @suppress **This is unstable API and it is subject to change.**
      */
-    internal open fun handleException(exception: Throwable) {
+    internal actual open fun handleException(exception: Throwable) {
         throw exception
     }
 
@@ -1162,23 +1162,23 @@ internal open class JobSupport(active: Boolean) : Job, SelectClause0 {
      *               null when it has completed normally.
      * @suppress **This is unstable API and it is subject to change.**
      */
-    internal open fun onCancellationInternal(exceptionally: CompletedExceptionally?) {}
+    internal actual open fun onCancellationInternal(exceptionally: CompletedExceptionally?) {}
 
     /**
      * Override for post-completion actions that need to do something with the state.
      * @param mode completion mode.
      * @suppress **This is unstable API and it is subject to change.**
      */
-    internal open fun afterCompletion(state: Any?, mode: Int) {}
+    internal actual open fun afterCompletion(state: Any?, mode: Int) {}
 
     // for nicer debugging
-    override fun toString(): String =
+    public override fun toString(): String =
         "${nameString()}{${stateString()}}@$hexAddress"
 
     /**
      * @suppress **This is unstable API and it is subject to change.**
      */
-    internal open fun nameString(): String = this::class.java.simpleName
+    internal actual open fun nameString(): String = this::class.java.simpleName
 
     private fun stateString(): String {
         val state = this.state

core/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CoroutineContext.kt

@@ -4,6 +4,6 @@
     "mocha": "^4.1.0"
   },
   "dependencies": {
-    "source-map-support": "^0.5.0"
+    "source-map-support": "^0.5.2"
   }
 }

core/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Job.kt

@@ -59,8 +59,7 @@ public actual fun launch(
     val coroutine = if (start.isLazy)
         LazyStandaloneCoroutine(newContext, block) else
         StandaloneCoroutine(newContext, active = true)
-    coroutine.initParentJob(newContext[Job])
-    start(block, coroutine, coroutine)
+    coroutine.start(start, coroutine, block)
     return coroutine
 }
 
@@ -106,7 +105,7 @@ public actual suspend fun <T> withContext(
         context = newContext,
         delegate = cont,
         resumeMode = if (start == CoroutineStart.ATOMIC) MODE_ATOMIC_DEFAULT else MODE_CANCELLABLE)
-    completion.initParentJob(newContext[Job]) // attach to job
+    completion.initParentJobInternal(newContext[Job]) // attach to job
     start(block, completion)
     completion.getResult()
 }
@@ -117,9 +116,9 @@ private open class StandaloneCoroutine(
         private val parentContext: CoroutineContext,
         active: Boolean
 ) : AbstractCoroutine<Unit>(parentContext, active) {
-    override fun onCancellation(exceptionally: CompletedExceptionally?) {
+    override fun onCancellation(cause: Throwable?) {
         // note the use of the parent's job context below!
-        if (exceptionally != null) handleCoroutineException(parentContext, exceptionally.exception)
+        if (cause != null) handleCoroutineException(parentContext, cause)
     }
 }
 

js/kotlinx-coroutines-core-js/package.json

@@ -202,7 +202,7 @@ internal class CancellableContinuationImpl<in T>(
         get() = _context ?: (delegate.context + this).also { _context = it }
 
     override fun initCancellability() {
-        initParentJob(delegate.context[Job])
+        initParentJobInternal(delegate.context[Job])
     }
 
     override val onCancelMode: Int get() = ON_CANCEL_MAKE_CANCELLED
@@ -259,8 +259,8 @@ internal class CancellableContinuationImpl<in T>(
     override fun <T> getSuccessfulResult(state: Any?): T =
         if (state is CompletedIdempotentResult) state.result as T else state as T
 
-    override fun toString(): String =
-        "CancellableContinuation{${stateString()}}[$delegate]"
+    override fun nameString(): String =
+        "CancellableContinuation(${delegate.toDebugString()})"
 
     // todo: This workaround for KT-21968, should be removed in the future
     public override fun cancel(cause: Throwable?): Boolean =