Fix detekt

Author: Mr3zee

detekt/config.yaml

@@ -219,7 +219,7 @@ empty-blocks:
   EmptyForBlock:
     active: true
   EmptyFunctionBlock:
-    active: true
+    active: false
     ignoreOverridden: false
   EmptyIfBlock:
     active: true
@@ -288,7 +288,7 @@ exceptions:
   ThrowingNewInstanceOfSameException:
     active: true
   TooGenericExceptionCaught:
-    active: true
+    active: false
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**']
     exceptionNames:
       - 'ArrayIndexOutOfBoundsException'

krpc/krpc-client/src/commonMain/kotlin/kotlinx/rpc/krpc/client/KrpcClient.kt

@@ -480,7 +480,7 @@ public abstract class KrpcClient : RpcClient, KrpcEndpoint {
 
             // stop the flow and its coroutine, other flows are not affected
             throw e
-        } catch (@Suppress("detekt.TooGenericExceptionCaught") cause: Throwable) {
+        } catch (cause: Throwable) {
             val serializedReason = serializeException(cause)
             val message = KrpcCallMessage.StreamCancel(
                 callId = outgoingStream.callId,

krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/BufferResult.kt

@@ -6,7 +6,7 @@ package kotlinx.rpc.krpc.internal
 
 internal sealed interface BufferResult<T> {
     class Success<T>(val message: T) : BufferResult<T>
-    class Failure<T>() : BufferResult<T>
+    class Failure<T> : BufferResult<T>
     class Closed<T>(val cause: Throwable?) : BufferResult<T>
 }
 

krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/KrpcConnector.kt

@@ -287,7 +287,10 @@ public class KrpcConnector(
                 }
 
                 else -> {
-                    logger.error { "Unsupported serialization format: ${serialFormat::class} for ${transportMessage::class}" }
+                    logger.error {
+                        "Unsupported serialization format: ${serialFormat::class} for ${transportMessage::class}"
+                    }
+
                     return null
                 }
             }

krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/KrpcReceiveHandler.kt

@@ -243,7 +243,9 @@ internal fun decodeWindow(message: KrpcGenericMessage): WindowResult {
     }
 
     val updateParam = windowParam.toIntOrNull()
-        ?: return WindowResult.Failure("Window param must be of the form <available>/<windowId> and in form of two longs")
+        ?: return WindowResult.Failure(
+            "Window param must be of the form <available>/<windowId> and in form of two longs"
+        )
 
     val windowKey = message.pluginParams[KrpcPluginKey.WINDOW_KEY]?.split("/").orEmpty()
     val serviceType = windowKey.getOrNull(0)

krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/KrpcSendHandler.kt

@@ -41,7 +41,7 @@ internal class KrpcSendHandler(
     private val continuationsLock = ReentrantLock()
 
     // internal for tests
-    @Suppress("PropertyName")
+    @Suppress("PropertyName", "detekt.VariableNaming")
     internal val __continuations = mutableListOf<CancellableContinuation<Unit>>()
 
     fun updateWindowSize(update: Int) {
@@ -61,13 +61,15 @@ internal class KrpcSendHandler(
             }
 
             continuationsLock.withLock {
-                (0 until window).forEach { _ ->
+                @Suppress("unused")
+                for (i in 0 until window) {
                     __continuations.removeFirstOrNull()?.resume(Unit)
                 }
             }
         }
     }
 
+    @Suppress("detekt.ThrowsCount")
     suspend fun sendMessage(message: KrpcTransportMessage) {
         if (closed.value) {
             throw ClosedSendChannelException("KrpcSendHandler closed")

krpc/krpc-core/src/commonTest/kotlin/kotlinx/rpc/krpc/KrpcConnectorTest.kt

@@ -35,6 +35,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
 import kotlin.test.assertTrue
+import kotlin.test.fail
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
@@ -276,7 +277,7 @@ class KrpcConnectorTest : KrpcConnectorBaseTest() {
         client.subscribeToMessages(HandlerKey.Protocol) {
             if (it is KrpcProtocolMessage.Failure) {
                 if (!hsResult.clientShookHands.isCompleted) {
-                    throw IllegalStateException("Handshake must be first message, but got: $it")
+                    fail("Handshake must be first message, but got: $it")
                 }
 
                 clientExceptionsChannel.send(it)
@@ -288,7 +289,7 @@ class KrpcConnectorTest : KrpcConnectorBaseTest() {
         server.subscribeToMessages(HandlerKey.Protocol) {
             if (it is KrpcProtocolMessage.Failure) {
                 if (!hsResult.serverShookHands.isCompleted) {
-                    throw IllegalStateException("Handshake must be first message, but got: $it")
+                    fail("Handshake must be first message, but got: $it")
                 }
 
                 serverExceptionsChannel.send(it)

krpc/krpc-server/src/commonMain/kotlin/kotlinx/rpc/krpc/server/internal/KrpcServerService.kt

@@ -187,7 +187,7 @@ internal class KrpcServerService<@Rpc T : Any>(
                 val wrapped = ManualCancellationException(cause)
 
                 failure = wrapped
-            } catch (@Suppress("detekt.TooGenericExceptionCaught") cause: Throwable) {
+            } catch (cause: Throwable) {
                 failure = cause
             } finally {
                 if (failure != null) {
@@ -309,7 +309,7 @@ internal class KrpcServerService<@Rpc T : Any>(
             )
         } catch (cause: CancellationException) {
             throw cause
-        } catch (@Suppress("detekt.TooGenericExceptionCaught") cause: Throwable) {
+        } catch (cause: Throwable) {
             val serializedCause = serializeException(cause)
             connector.sendMessage(
                 KrpcCallMessage.StreamCancel(

krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTestServiceBackend.kt

@@ -6,7 +6,6 @@ package kotlinx.rpc.krpc.test
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.test.TestScope
 import kotlinx.serialization.Serializable
 import kotlin.coroutines.resumeWithException
 import kotlin.test.assertContentEquals
@@ -107,7 +106,9 @@ class KrpcTestServiceBackend : KrpcTestService {
         return arg1
     }
 
-    override suspend fun returnTestClassThatThrowsWhileDeserialization(value: Int): TestClassThatThrowsWhileDeserialization {
+    override suspend fun returnTestClassThatThrowsWhileDeserialization(
+        value: Int,
+    ): TestClassThatThrowsWhileDeserialization {
         return TestClassThatThrowsWhileDeserialization(value)
     }
 

krpc/krpc-test/src/commonMain/kotlin/kotlinx/rpc/krpc/test/KrpcTransportTestBase.kt

@@ -349,7 +349,7 @@ abstract class KrpcTransportTestBase {
     }
 
     @Test
-    @Suppress("detekt.TooGenericExceptionCaught", "detekt.ThrowsCount")
+    @Suppress("detekt.ThrowsCount")
     fun testExceptionSerializationAndPropagating() = runTest {
         try {
             client.throwsIllegalArgument("me")