~: style fixes

Author: qwwdfsad

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

@@ -86,8 +86,6 @@ internal actual fun <E : Throwable> unwrap(exception: E): E {
 private fun <E : Throwable> recoveryDisabled(exception: E) =
     !RECOVER_STACKTRACE || !DEBUG || exception is CancellationException || exception is NonRecoverableThrowable
 
-
-
 private fun createStackTrace(continuation: CoroutineStackFrame): ArrayList<StackTraceElement> {
     val stack = ArrayList<StackTraceElement>()
     continuation.getStackTraceElement()?.let { stack.add(sanitize(it)) }
@@ -104,7 +102,6 @@ internal fun sanitize(element: StackTraceElement): StackTraceElement {
     if (!element.className.contains('/')) {
         return element
     }
-
     // STE generated with debug metadata contains '/' as separators in FQN, while Java contains dots
     return StackTraceElement(element.className.replace('/', '.'), element.methodName, element.fileName, element.lineNumber)
 }

core/kotlinx-coroutines-core/src/internal/ExceptionsConstuctor.kt

@@ -9,7 +9,8 @@ import java.util.concurrent.locks.*
 import kotlin.concurrent.*
 
 private val cacheLock = ReentrantReadWriteLock()
-private val exceptionConstructors: WeakHashMap<Class<*>, (Throwable) -> Throwable?> = WeakHashMap()
+// Replace it with ClassValue when Java 6 support is over
+private val exceptionConstructors: WeakHashMap<Class<out Throwable>, (Throwable) -> Throwable?> = WeakHashMap()
 
 @Suppress("UNCHECKED_CAST")
 internal fun <E : Throwable> tryCopyException(exception: E): E? {
@@ -24,7 +25,6 @@ internal fun <E : Throwable> tryCopyException(exception: E): E? {
      * Exceptions are shared among coroutines, so we should copy exception before recovering current stacktrace.
      */
     var ctor: ((Throwable) -> Throwable?)? = null
-
     val constructors = exception.javaClass.constructors.sortedByDescending { it.parameterTypes.size }
     for (constructor in constructors) {
         val parameters = constructor.parameterTypes

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

@@ -97,7 +97,7 @@ class StackTraceRecoveryTest : TestBase() {
                 "Caused by: java.lang.IllegalArgumentException\n" +
                         "\tat kotlinx.coroutines.exceptions.StackTraceRecoveryTest\$testReceiveFromChannel\$1\$job\$1.invokeSuspend(StackTraceRecoveryTest.kt:93)\n" +
                         "\tat kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:32)\n" +
-                        "\tat kotlinx.coroutines.DispatchedTask\$DefaultImpls.run(Dispatched.kt:152)"
+                        "\tat kotlinx.coroutines.DispatchedTask.run(Dispatched.kt:152)"
             )
         )
         expect(3)

integration/kotlinx-coroutines-play-services/test/TaskTest.kt

@@ -4,22 +4,12 @@
 
 package kotlinx.coroutines.tasks
 
-import com.google.android.gms.tasks.RuntimeExecutionException
-import com.google.android.gms.tasks.Tasks
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.TestBase
-import kotlinx.coroutines.async
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.ignoreLostThreads
-import org.hamcrest.core.IsEqual
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-import java.util.concurrent.locks.ReentrantLock
-import kotlin.concurrent.withLock
+import com.google.android.gms.tasks.*
+import kotlinx.coroutines.*
+import org.hamcrest.core.*
+import org.junit.*
+import java.util.concurrent.locks.*
+import kotlin.concurrent.*
 
 class TaskTest : TestBase() {
     @Before
@@ -79,7 +69,7 @@ class TaskTest : TestBase() {
             runTest { task.await() }
         } catch (e: RuntimeExecutionException) {
             Assert.assertFalse(task.isSuccessful)
-            Assert.assertTrue(e.cause is OutOfMemoryError)
+            Assert.assertTrue(e.cause?.cause is OutOfMemoryError)
         }
     }