Workarounds for KT-21968 to fix JS tests

Author: elizarov

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

@@ -167,5 +167,17 @@ public abstract class AbstractCoroutine<in T>(
         @Suppress("DEPRECATION")
         start(block, receiver, this)
     }
+
+    // todo: This workaround for KT-21968, should be removed in the future
+    override fun invokeOnCompletion(
+        onCancelling: Boolean,
+        invokeImmediately: Boolean,
+        handler: CompletionHandler
+    ): DisposableHandle =
+        super.invokeOnCompletion(onCancelling, invokeImmediately, handler)
+
+    // todo: This workaround for KT-21968, should be removed in the future
+    override fun cancel(cause: Throwable?) =
+        super.cancel(cause)
 }
 

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

@@ -68,17 +68,23 @@ internal expect open class JobSupport(active: Boolean) : Job {
 
     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 override fun cancel(cause: Throwable?): Boolean
+
     public final override fun attachChild(child: Job): DisposableHandle
     public final override suspend fun join()
-    public final override fun invokeOnCompletion(
+
+    // todo: non-final as a workaround for KT-21968, should be final in the future
+    public override fun invokeOnCompletion(
         onCancelling: Boolean,
         invokeImmediately: Boolean,
         handler: CompletionHandler
     ): DisposableHandle
 
+    public val isCompletedExceptionally: Boolean
+    public fun getCompletionExceptionOrNull(): Throwable?
+
     internal fun initParentJobInternal(parent: Job?)
     internal fun makeCompletingOnce(proposedUpdate: Any?, mode: Int): Boolean
     internal open fun afterCompletion(state: Any?, mode: Int)

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

@@ -813,7 +813,8 @@ internal actual open class JobSupport actual constructor(active: Boolean) : Job,
     public final override fun invokeOnCompletion(onCancelling_: Boolean, handler: CompletionHandler): DisposableHandle =
         invokeOnCompletion(onCancelling = onCancelling_, invokeImmediately = true, handler = handler)
 
-    public actual final override fun invokeOnCompletion(
+    // todo: non-final as a workaround for KT-21968, should be final in the future
+    public actual override fun invokeOnCompletion(
         onCancelling: Boolean,
         invokeImmediately: Boolean,
         handler: CompletionHandler
@@ -1244,9 +1245,9 @@ internal actual open class JobSupport actual constructor(active: Boolean) : Job,
      * =================================================================================================
      */
 
-    public val isCompletedExceptionally: Boolean get() = state is CompletedExceptionally
+    public actual val isCompletedExceptionally: Boolean get() = state is CompletedExceptionally
 
-    public fun getCompletionExceptionOrNull(): Throwable? {
+    public actual fun getCompletionExceptionOrNull(): Throwable? {
         val state = this.state
         check(state !is Incomplete) { "This job has not completed yet" }
         return state.exceptionOrNull

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

@@ -555,7 +555,8 @@ internal actual open class JobSupport actual constructor(active: Boolean) : Job
         }
     }
 
-    public actual final override fun invokeOnCompletion(onCancelling: Boolean, invokeImmediately: Boolean, handler: CompletionHandler) =
+    // todo: non-final as a workaround for KT-21968, should be final in the future
+    public actual override fun invokeOnCompletion(onCancelling: Boolean, invokeImmediately: Boolean, handler: CompletionHandler) =
         installNode(onCancelling, invokeImmediately, makeNode(handler, onCancelling))
 
     private fun installNode(
@@ -944,9 +945,9 @@ internal actual open class JobSupport actual constructor(active: Boolean) : Job
      * =================================================================================================
      */
 
-    public val isCompletedExceptionally: Boolean get() = state is CompletedExceptionally
+    public actual val isCompletedExceptionally: Boolean get() = state is CompletedExceptionally
 
-    public fun getCompletionExceptionOrNull(): Throwable? {
+    public actual fun getCompletionExceptionOrNull(): Throwable? {
         val state = this.state
         check(state !is Incomplete) { "This job has not completed yet" }
         return state.exceptionOrNull