Migrate to Kotlin 1.4

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/internal/InternalEventListeners.kt

@@ -115,24 +115,9 @@ internal class Handler<in E : Event>
  */
 internal fun <E : Event> KClass<out E>.listeners(): EventListeners<E> = EventListenerManager.get(this)
 
-internal class EventListeners<E : Event>(clazz: KClass<E>) : LockFreeLinkedList<Listener<E>>() {
+internal expect class EventListeners<E : Event>(clazz: KClass<E>) : LockFreeLinkedList<Listener<E>> {
     @Suppress("UNCHECKED_CAST", "UNSUPPORTED", "NO_REFLECTION_IN_CLASS_PATH")
-    val supertypes: Set<KClass<out Event>> by lazy {
-        val supertypes = mutableSetOf<KClass<out Event>>()
-
-        fun addSupertypes(clazz: KClass<out Event>) {
-            clazz.supertypes.forEach {
-                val classifier = it.classifier as? KClass<out Event>
-                if (classifier != null) {
-                    supertypes.add(classifier)
-                    addSupertypes(classifier)
-                }
-            }
-        }
-        addSupertypes(clazz)
-
-        supertypes
-    }
+    val supertypes: Set<KClass<out Event>>
 }
 
 internal expect class MiraiAtomicBoolean(initial: Boolean) {

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/select.kt

@@ -285,7 +285,7 @@ abstract class MessageSelectBuilderUnit<M : MessagePacket<*, *>, R> @PublishedAp
      * 在超时后引用回复原消息
      *
      * 当 [block] 返回值为 [Unit] 时不回复, 为 [Message] 时回复 [Message], 其他将 [toString] 后回复为 [PlainText]
-
+     *
      * @see timeout
      * @see reply
      */
@@ -304,8 +304,7 @@ abstract class MessageSelectBuilderUnit<M : MessagePacket<*, *>, R> @PublishedAp
      */
     @MessageDsl
     fun defaultReply(block: suspend () -> Any?): Unit = subscriber({ true }, {
-        @Suppress("DSL_SCOPE_VIOLATION_WARNING") // false positive
-        executeAndReply(block)
+        this@MessageSelectBuilderUnit.executeAndReply(block)
     })
 
 
@@ -316,8 +315,7 @@ abstract class MessageSelectBuilderUnit<M : MessagePacket<*, *>, R> @PublishedAp
      */
     @MessageDsl
     fun defaultQuoteReply(block: suspend () -> Any?): Unit = subscriber({ true }, {
-        @Suppress("DSL_SCOPE_VIOLATION_WARNING") // false positive
-        executeAndQuoteReply(block)
+        this@MessageSelectBuilderUnit.executeAndQuoteReply(block)
     })
 
     private suspend inline fun executeAndReply(noinline block: suspend () -> Any?) {

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/contentToString.kt

@@ -13,7 +13,9 @@ package net.mamoe.mirai.utils
 
 import net.mamoe.mirai.utils.io.toUHexString
 import kotlin.reflect.KClass
+import kotlin.reflect.KProperty
 import kotlin.reflect.KProperty1
+import kotlin.reflect.KType
 
 private val indent: String = " ".repeat(4)
 
@@ -127,8 +129,14 @@ fun Any?._miraiContentToString(prefix: String = ""): String = when (this) {
 
 internal expect fun KProperty1<*, *>.getValueAgainstPermission(receiver: Any): Any?
 
+private val KProperty1<*, *>.isConst: Boolean get() = false // on JVM, it will be resolved to member function
+private val KClass<*>.isData: Boolean get() = false // on JVM, it will be resolved to member function
+
 @MiraiDebugAPI
-private fun Any.contentToStringReflectively(prefix: String, filter: ((name: String, value: Any?) -> Boolean)? = null): String {
+private fun Any.contentToStringReflectively(
+    prefix: String,
+    filter: ((name: String, value: Any?) -> Boolean)? = null
+): String {
     val newPrefix = "$prefix    "
     return (this::class.simpleName ?: "<UnnamedClass>") + "#" + this::class.hashCode() + " {\n" +
             this.allMembersFromSuperClassesMatching { it.qualifiedName?.startsWith("net.mamoe.mirai") == true }
@@ -155,11 +163,14 @@ private fun Any.contentToStringReflectively(prefix: String, filter: ((name: Stri
                 } + "\n$prefix}"
 }
 
+private val <T : Any> KClass<T>.supertypes: List<KType> get() = listOf() // on JVM, it will be resolved to member function
+
 private fun KClass<out Any>.thisClassAndSuperclassSequence(): Sequence<KClass<out Any>> {
     return sequenceOf(this) +
             this.supertypes.asSequence()
                 .mapNotNull { type -> type.classifier?.takeIf { it is KClass<*> }?.takeIf { it != Any::class } as? KClass<out Any> }.flatMap { it.thisClassAndSuperclassSequence() }
 }
+private val <T : Any> KClass<T>.members: List<KProperty<*>> get() = listOf() // on JVM, it will be resolved to member function
 
 @Suppress("UNCHECKED_CAST")
 private fun Any.allMembersFromSuperClassesMatching(classFilter: (KClass<out Any>) -> Boolean): Sequence<KProperty1<Any, *>> {