From 951ddc31381fb10fa9b5950abd4773d2ffcbd04e Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Thu, 8 Apr 2021 18:07:21 +0800
Subject: [PATCH] Declare type explicitly for IDE inference issue

---
 .../commonMain/kotlin/message/incomingSourceImpl.kt  |  8 ++++----
 .../commonMain/kotlin/message/outgoingSourceImpl.kt  | 12 ++++++------
 .../src/commonMain/kotlin/utils/contentToString.kt   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt b/mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt
index c0ea019aa..520c9b795 100644
--- a/mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt
+++ b/mirai-core/src/commonMain/kotlin/message/incomingSourceImpl.kt
@@ -52,7 +52,7 @@ internal class OnlineMessageSourceFromFriendImpl(
     }
     override val sender: Friend = bot.getFriendOrFail(msg.first().msgHead.fromUin)
 
-    private val jceData by lazy { msg.toJceDataPrivate(internalIds) }
+    private val jceData: ImMsgBody.SourceMsg by lazy { msg.toJceDataPrivate(internalIds) }
 
     override fun toJceData(): ImMsgBody.SourceMsg = jceData
 }
@@ -76,7 +76,7 @@ internal class OnlineMessageSourceFromStrangerImpl(
     }
     override val sender: Stranger = bot.getStrangerOrFail(msg.first().msgHead.fromUin)
 
-    private val jceData by lazy { msg.toJceDataPrivate(internalIds) }
+    private val jceData: ImMsgBody.SourceMsg by lazy { msg.toJceDataPrivate(internalIds) }
 
     override fun toJceData(): ImMsgBody.SourceMsg = jceData
 }
@@ -139,7 +139,7 @@ internal class OnlineMessageSourceFromTempImpl(
         bot.getGroupOrFail(c2cTmpMsgHead!!.groupUin).getOrFail(fromUin)
     }
 
-    private val jceData by lazy { msg.toJceDataPrivate(internalIds) }
+    private val jceData: ImMsgBody.SourceMsg by lazy { msg.toJceDataPrivate(internalIds) }
     override fun toJceData(): ImMsgBody.SourceMsg = jceData
 }
 
@@ -178,7 +178,7 @@ internal class OnlineMessageSourceFromGroupImpl(
         }
     }
 
-    private val jceData by lazy {
+    private val jceData: ImMsgBody.SourceMsg by lazy {
         ImMsgBody.SourceMsg(
             origSeqs = intArrayOf(msg.first().msgHead.msgSeq),
             senderUin = msg.first().msgHead.fromUin,
diff --git a/mirai-core/src/commonMain/kotlin/message/outgoingSourceImpl.kt b/mirai-core/src/commonMain/kotlin/message/outgoingSourceImpl.kt
index 516c40399..ef5c6dcb6 100644
--- a/mirai-core/src/commonMain/kotlin/message/outgoingSourceImpl.kt
+++ b/mirai-core/src/commonMain/kotlin/message/outgoingSourceImpl.kt
@@ -90,7 +90,7 @@ internal class OnlineMessageSourceToFriendImpl(
     override val ids: IntArray
         get() = sequenceIds
     override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
-    private val jceData by lazy { toJceDataImpl(subject) }
+    private val jceData: ImMsgBody.SourceMsg by lazy { toJceDataImpl(subject) }
     override fun toJceData(): ImMsgBody.SourceMsg = jceData
 }
 
@@ -105,7 +105,7 @@ internal class OnlineMessageSourceToStrangerImpl(
 ) : OnlineMessageSource.Outgoing.ToStranger(), MessageSourceInternal {
 
     constructor(
-        delegate: OnlineMessageSource.Outgoing,
+        delegate: Outgoing,
         target: Stranger
     ) : this(delegate.ids, delegate.internalIds, delegate.time, delegate.originalMessage, delegate.sender, target)
 
@@ -116,7 +116,7 @@ internal class OnlineMessageSourceToStrangerImpl(
     override val ids: IntArray
         get() = sequenceIds
     override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
-    private val jceData by lazy { toJceDataImpl(subject) }
+    private val jceData: ImMsgBody.SourceMsg by lazy { toJceDataImpl(subject) }
     override fun toJceData(): ImMsgBody.SourceMsg = jceData
 }
 
@@ -130,7 +130,7 @@ internal class OnlineMessageSourceToTempImpl(
     override val target: Member
 ) : OnlineMessageSource.Outgoing.ToTemp(), MessageSourceInternal {
     constructor(
-        delegate: OnlineMessageSource.Outgoing,
+        delegate: Outgoing,
         target: Member
     ) : this(delegate.ids, delegate.internalIds, delegate.time, delegate.originalMessage, delegate.sender, target)
 
@@ -141,7 +141,7 @@ internal class OnlineMessageSourceToTempImpl(
     override val ids: IntArray
         get() = sequenceIds
     override var isRecalledOrPlanned: AtomicBoolean = AtomicBoolean(false)
-    private val jceData by lazy { toJceDataImpl(subject) }
+    private val jceData: ImMsgBody.SourceMsg by lazy { toJceDataImpl(subject) }
     override fun toJceData(): ImMsgBody.SourceMsg = jceData
 }
 
@@ -190,7 +190,7 @@ internal class OnlineMessageSourceToGroupImpl(
 
     suspend fun ensureSequenceIdAvailable() = kotlin.run { sequenceIdDeferred.await() }
 
-    private val jceData by lazy {
+    private val jceData: ImMsgBody.SourceMsg by lazy {
         val elements = originalMessage.toRichTextElems(subject, withGeneralFlags = true)
         ImMsgBody.SourceMsg(
             origSeqs = sequenceIds,
diff --git a/mirai-core/src/commonMain/kotlin/utils/contentToString.kt b/mirai-core/src/commonMain/kotlin/utils/contentToString.kt
index ae92589b4..2590a3118 100644
--- a/mirai-core/src/commonMain/kotlin/utils/contentToString.kt
+++ b/mirai-core/src/commonMain/kotlin/utils/contentToString.kt
@@ -32,7 +32,7 @@ private fun <T> Sequence<T>.joinToStringPrefixed(prefix: String, transform: (T)
     return this.joinToString(prefix = "$prefix$indent", separator = "\n$prefix$indent", transform = transform)
 }
 
-private val SoutvLogger by lazy { MiraiLogger.create("soutv") }
+private val SoutvLogger: MiraiLogger by lazy { MiraiLogger.create("soutv") }
 internal fun Any?.soutv(name: String = "unnamed") {
     @Suppress("DEPRECATION")
     SoutvLogger.debug { "$name = ${this._miraiContentToString()}" }