Fill in stacktraces in debug mode

Author: qwwdfsad

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

@@ -23,7 +23,7 @@ internal expect class JobCancellationException(
     internal val job: Job
 }
 
-internal expect class CoroutinesInternalError(message: String, cause: Throwable) : Error
+internal class CoroutinesInternalError(message: String, cause: Throwable) : Error(message, cause)
 
 internal expect fun Throwable.addSuppressedThrowable(other: Throwable)
 // For use in tests

kotlinx-coroutines-core/common/src/flow/internal/AbortFlowException.common.kt renamed to kotlinx-coroutines-core/common/src/flow/internal/FlowExceptions.common.kt

@@ -11,3 +11,8 @@ import kotlinx.coroutines.*
  * This exception should never escape outside of operator's implementation.
  */
 internal expect class AbortFlowException() : CancellationException
+
+/**
+ * Exception used to cancel child of [scopedFlow] without cancelling the whole scope.
+ */
+internal expect class ChildCancelledException() : CancellationException

kotlinx-coroutines-core/common/src/flow/internal/FlowScope.kt

@@ -56,5 +56,3 @@ internal class FlowScope<T, R>(
 
     override suspend fun emit(value: R) = collector.emit(value)
 }
-
-internal class ChildCancelledException : CancellationException(null)

kotlinx-coroutines-core/js/src/Exceptions.kt

@@ -48,8 +48,6 @@ internal actual class JobCancellationException public actual constructor(
         (message!!.hashCode() * 31 + job.hashCode()) * 31 + (cause?.hashCode() ?: 0)
 }
 
-internal actual class CoroutinesInternalError actual constructor(message: String, cause: Throwable) : Error(message.withCause(cause))
-
 @Suppress("FunctionName")
 internal fun IllegalStateException(message: String, cause: Throwable?) =
     IllegalStateException(message.withCause(cause))

kotlinx-coroutines-core/js/src/flow/internal/AbortFlowException.kt renamed to kotlinx-coroutines-core/js/src/flow/internal/FlowExceptions.kt

@@ -7,3 +7,4 @@ package kotlinx.coroutines.flow.internal
 import kotlinx.coroutines.*
 
 internal actual class AbortFlowException : CancellationException("Flow was aborted, no more elements needed")
+internal actual class ChildCancelledException : CancellationException("Child of the scoped flow was cancelled")

kotlinx-coroutines-core/jvm/src/Exceptions.kt

@@ -80,8 +80,6 @@ internal actual class JobCancellationException public actual constructor(
         (message!!.hashCode() * 31 + job.hashCode()) * 31 + (cause?.hashCode() ?: 0)
 }
 
-internal actual class CoroutinesInternalError actual constructor(message: String, cause: Throwable) : Error(message, cause)
-
 @Suppress("NOTHING_TO_INLINE")
 internal actual inline fun Throwable.addSuppressedThrowable(other: Throwable) =
-    addSuppressed(other)
+    addSuppressed(other)

kotlinx-coroutines-core/jvm/src/flow/internal/AbortFlowException.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.coroutines.flow.internal
+
+import kotlinx.coroutines.*
+
+internal actual class AbortFlowException : CancellationException("Flow was aborted, no more elements needed") {
+    override fun fillInStackTrace(): Throwable {
+        if (DEBUG) super.fillInStackTrace()
+        return this
+    }
+}
+
+internal actual class ChildCancelledException : CancellationException("Child of the scoped flow was cancelled") {
+    override fun fillInStackTrace(): Throwable {
+        if (DEBUG) super.fillInStackTrace()
+        return this
+    }
+}

kotlinx-coroutines-core/jvm/src/flow/internal/FlowExceptions.kt

@@ -54,8 +54,7 @@ private class BlockingCoroutine<T>(
     parentContext: CoroutineContext,
     private val eventLoop: EventLoop?
 ) : AbstractCoroutine<T>(parentContext, true) {
-    override val isCoroutine: Boolean
-        get() = false // it throws exception to parent instead of cancelling it
+    override val isScopedCoroutine: Boolean get() = true
 
     @Suppress("UNCHECKED_CAST")
     fun joinBlocking(): T = memScoped {

kotlinx-coroutines-core/native/src/Builders.kt

@@ -48,8 +48,6 @@ internal actual class JobCancellationException public actual constructor(
         (message!!.hashCode() * 31 + job.hashCode()) * 31 + (cause?.hashCode() ?: 0)
 }
 
-internal actual class CoroutinesInternalError actual constructor(message: String, cause: Throwable) : Error(message.withCause(cause))
-
 @Suppress("FunctionName")
 internal fun IllegalStateException(message: String, cause: Throwable?) =
     IllegalStateException(message.withCause(cause))

kotlinx-coroutines-core/native/src/Exceptions.kt

@@ -7,3 +7,5 @@ package kotlinx.coroutines.flow.internal
 import kotlinx.coroutines.*
 
 internal actual class AbortFlowException : CancellationException("Flow was aborted, no more elements needed")
+internal actual class ChildCancelledException : CancellationException("Child of the scoped flow was cancelled")
+