Properly support exception cause on JS and Native

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

@@ -5,14 +5,16 @@
 package kotlinx.coroutines
 
 /**
+ * This exception gets thrown if an exception is caught while processing [CompletionHandler] invocation for [Job].
+ *
  * @suppress **This an internal API and should not be used from general code.**
  */
 @InternalCoroutinesApi
-public expect class CompletionHandlerException(message: String, cause: Throwable) : RuntimeException
+public class CompletionHandlerException(message: String, cause: Throwable) : RuntimeException(message, cause)
 
 public expect open class CancellationException(message: String?) : IllegalStateException
 
-@Suppress("FunctionName")
+@Suppress("FunctionName", "NO_ACTUAL_FOR_EXPECT")
 public expect fun CancellationException(message: String?, cause: Throwable?) : CancellationException
 
 internal expect class JobCancellationException(

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

@@ -4,31 +4,18 @@
 
 package kotlinx.coroutines
 
-/**
- * This exception gets thrown if an exception is caught while processing [CompletionHandler] invocation for [Job].
- *
- * @suppress **This an internal API and should not be used from general code.**
- */
-@InternalCoroutinesApi
-public actual class CompletionHandlerException public actual constructor(
- message: String,
- public override val cause: Throwable
-) : RuntimeException(message.withCause(cause))
-
 /**
  * Thrown by cancellable suspending functions if the [Job] of the coroutine is cancelled while it is suspending.
  * It indicates _normal_ cancellation of a coroutine.
  * **It is not printed to console/log by default uncaught exception handler**.
  * (see [CoroutineExceptionHandler]).
  */
-public actual open class CancellationException actual constructor(message: String?) : IllegalStateException(message)
-
-/**
- * Creates a cancellation exception with a specified message and [cause].
- */
-@Suppress("FunctionName")
-public actual fun CancellationException(message: String?, cause: Throwable?) : CancellationException =
- CancellationException(message.withCause(cause))
+public actual open class CancellationException(
+ message: String?,
+ cause: Throwable?
+) : IllegalStateException(message, cause) {
+ actual constructor(message: String?) : this(message, null)
+}
 
 /**
  * Thrown by cancellable suspending functions if the [Job] of the coroutine is cancelled or completed
@@ -37,9 +24,9 @@ public actual fun CancellationException(message: String?, cause: Throwable?) : C
  */
 internal actual class JobCancellationException public actual constructor(
  message: String,
- public override val cause: Throwable?,
+ cause: Throwable?,
  internal actual val job: Job
-) : CancellationException(message.withCause(cause)) {
+) : CancellationException(message, cause) {
  override fun toString(): String = "${super.toString()}; job=$job"
  override fun equals(other: Any?): Boolean =
  other === this ||
@@ -48,17 +35,6 @@ internal actual class JobCancellationException public actual constructor(
  (message!!.hashCode() * 31 + job.hashCode()) * 31 + (cause?.hashCode() ?: 0)
 }
 
-@Suppress("FunctionName")
-internal fun IllegalStateException(message: String, cause: Throwable?) =
- IllegalStateException(message.withCause(cause))
-
-private fun String?.withCause(cause: Throwable?) =
- when {
- cause == null -> this
- this == null -> "caused by $cause"
- else -> "$this; caused by $cause"
- }
-
 @Suppress("NOTHING_TO_INLINE")
 internal actual inline fun Throwable.addSuppressedThrowable(other: Throwable) { /* empty */ }
 

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

@@ -6,17 +6,6 @@
 
 package kotlinx.coroutines
 
-/**
- * This exception gets thrown if an exception is caught while processing [CompletionHandler] invocation for [Job].
- *
- * @suppress **This an internal API and should not be used from general code.**
- */
-@InternalCoroutinesApi
-public actual class CompletionHandlerException actual constructor(
- message: String,
- cause: Throwable
-) : RuntimeException(message, cause)
-
 /**
  * Thrown by cancellable suspending functions if the [Job] of the coroutine is cancelled while it is suspending.
  * It indicates _normal_ cancellation of a coroutine.

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

@@ -4,31 +4,18 @@
 
 package kotlinx.coroutines
 
-/**
- * This exception gets thrown if an exception is caught while processing [CompletionHandler] invocation for [Job].
- *
- * @suppress **This an internal API and should not be used from general code.**
- */
-@InternalCoroutinesApi
-public actual class CompletionHandlerException public actual constructor(
- message: String,
- public override val cause: Throwable
-) : RuntimeException(message.withCause(cause))
-
 /**
  * Thrown by cancellable suspending functions if the [Job] of the coroutine is cancelled while it is suspending.
  * It indicates _normal_ cancellation of a coroutine.
  * **It is not printed to console/log by default uncaught exception handler**.
  * (see [CoroutineExceptionHandler]).
  */
-public actual open class CancellationException actual constructor(message: String?) : IllegalStateException(message)
-
-/**
- * Creates a cancellation exception with a specified message and [cause].
- */
-@Suppress("FunctionName")
-public actual fun CancellationException(message: String?, cause: Throwable?) : CancellationException =
- CancellationException(message.withCause(cause))
+public actual open class CancellationException(
+ message: String?,
+ cause: Throwable?
+) : IllegalStateException(message, cause) {
+ actual constructor(message: String?) : this(message, null)
+}
 
 /**
  * Thrown by cancellable suspending functions if the [Job] of the coroutine is cancelled or completed
@@ -37,9 +24,9 @@ public actual fun CancellationException(message: String?, cause: Throwable?) : C
  */
 internal actual class JobCancellationException public actual constructor(
  message: String,
- public override val cause: Throwable?,
+ cause: Throwable?,
  internal actual val job: Job
-) : CancellationException(message.withCause(cause)) {
+) : CancellationException(message, cause) {
  override fun toString(): String = "${super.toString()}; job=$job"
  override fun equals(other: Any?): Boolean =
  other === this ||
@@ -48,17 +35,6 @@ internal actual class JobCancellationException public actual constructor(
  (message!!.hashCode() * 31 + job.hashCode()) * 31 + (cause?.hashCode() ?: 0)
 }
 
-@Suppress("FunctionName")
-internal fun IllegalStateException(message: String, cause: Throwable?) =
- IllegalStateException(message.withCause(cause))
-
-private fun String?.withCause(cause: Throwable?) =
- when {
- cause == null -> this
- this == null -> "caused by $cause"
- else -> "$this; caused by $cause"
- }
-
 @Suppress("NOTHING_TO_INLINE")
 internal actual inline fun Throwable.addSuppressedThrowable(other: Throwable) { /* empty */ }