Implement ScopeCoroutine in SupervisorCoroutine

Fixes #915

Author: qwwdfsad

kotlinx-coroutines-core/common/src/AbstractCoroutine.kt

@@ -37,7 +37,6 @@ public abstract class AbstractCoroutine<in T>(
     /**
      * Context of the parent coroutine.
      */
-
     @JvmField
     protected val parentContext: CoroutineContext,
     active: Boolean = true
@@ -53,7 +52,7 @@ public abstract class AbstractCoroutine<in T>(
      */
     public override val coroutineContext: CoroutineContext get() = context
 
-    override val isActive: Boolean get() = super<JobSupport>.isActive
+    override val isActive: Boolean get() = super.isActive
 
     /**
      * Initializes parent job from the `parentContext` of this coroutine that was passed to it during construction.

kotlinx-coroutines-core/common/src/Supervisor.kt

@@ -6,10 +6,10 @@
 
 package kotlinx.coroutines
 
+import kotlinx.coroutines.internal.*
 import kotlinx.coroutines.intrinsics.*
 import kotlin.coroutines.*
 import kotlin.coroutines.intrinsics.*
-import kotlin.jvm.*
 
 /**
  * Creates a new _supervisor_ job object in an active state.
@@ -56,18 +56,9 @@ private class SupervisorJobImpl(parent: Job?) : JobImpl(parent) {
     override fun childCancelled(cause: Throwable): Boolean = false
 }
 
-private class SupervisorCoroutine<R>(
-    parentContext: CoroutineContext,
-    @JvmField val uCont: Continuation<R>
-) : AbstractCoroutine<R>(parentContext, true) {
-    override val defaultResumeMode: Int get() = MODE_DIRECT
+private class SupervisorCoroutine<in T>(
+    context: CoroutineContext,
+    uCont: Continuation<T>
+) : ScopeCoroutine<T>(context, uCont) {
     override fun childCancelled(cause: Throwable): Boolean = false
-
-    @Suppress("UNCHECKED_CAST")
-    internal override fun onCompletionInternal(state: Any?, mode: Int, suppressed: Boolean) {
-        if (state is CompletedExceptionally)
-            uCont.resumeUninterceptedWithExceptionMode(state.cause, mode)
-        else
-            uCont.resumeUninterceptedMode(state as R, mode)
-    }
 }

kotlinx-coroutines-core/jvm/test/exceptions/StackTraceRecoveryTest.kt

@@ -180,6 +180,7 @@ class StackTraceRecoveryTest : TestBase() {
                     "\t(Coroutine boundary)\n" +
                     "\tat kotlinx.coroutines.DeferredCoroutine.await\$suspendImpl(Builders.common.kt:99)\n" +
                     "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest.innerMethod(StackTraceRecoveryTest.kt:158)\n" +
+                    "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$outerScopedMethod\$2\$1.invokeSuspend(StackTraceRecoveryTest.kt:193)\n" +
                     "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$outerScopedMethod\$2.invokeSuspend(StackTraceRecoveryTest.kt:151)\n" +
                     "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$testCoroutineScope\$1.invokeSuspend(StackTraceRecoveryTest.kt:141)\n",
             "Caused by: kotlinx.coroutines.RecoverableTestException\n" +
@@ -217,7 +218,10 @@ class StackTraceRecoveryTest : TestBase() {
     }
 
     private suspend fun outerScopedMethod(deferred: Deferred<Nothing>, vararg traces: String) = coroutineScope {
-        innerMethod(deferred, *traces)
+        supervisorScope {
+            innerMethod(deferred, *traces)
+            assertTrue(true)
+        }
         assertTrue(true)
     }