github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-04 16:42:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix StringConstant.toString and add notes for AbstractCommandValueParameter implementers

Browse Source
This commit is contained in:
Him188 2020-11-17 09:48:45 +08:00
parent fd2a22a798
commit 21428094a8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/mirai-console/src/command/descriptor/CommandParameter.kt
View File

@ -208,6 +208,8 @@ public sealed class AbstractCommandValueParameter<T> : CommandValueParameter<T>,
public override val isVararg: Boolean, public override val isVararg: Boolean,
public override val type: KType, public override val type: KType,
) : AbstractCommandValueParameter<T>() { ) : AbstractCommandValueParameter<T>() {
override fun toString(): String = super.toString()
init { init {
requireNotNull(type.classifierAsKClassOrNull()) { requireNotNull(type.classifierAsKClassOrNull()) {
"type.classifier must be KClass." "type.classifier must be KClass."
@ -237,7 +239,5 @@ public sealed class AbstractCommandValueParameter<T> : CommandValueParameter<T>,
* Extended by [CommandValueArgumentParser] * Extended by [CommandValueArgumentParser]
*/ */
@ConsoleExperimentalApi @ConsoleExperimentalApi
public abstract class Extended<T> : AbstractCommandValueParameter<T>() { public abstract class Extended<T> : AbstractCommandValueParameter<T>() // For implementer: take care of toString()
abstract override fun toString(): String
}
} }

4
backend/mirai-console/src/command/descriptor/CommandSignature.kt
View File

@ -58,9 +58,9 @@ public abstract class AbstractCommandSignature : CommandSignature {
override fun toString(): String { override fun toString(): String {
val receiverParameter = receiverParameter val receiverParameter = receiverParameter
return if (receiverParameter == null) { return if (receiverParameter == null) {
"CommandSignatureVariant(${valueParameters.joinToString()})" "CommandSignature(${valueParameters.joinToString()})"
} else { } else {
"CommandSignatureVariant($receiverParameter, ${valueParameters.joinToString()})" "CommandSignature($receiverParameter, ${valueParameters.joinToString()})"
} }
} }
} }

4
backend/mirai-console/test/command/TestCommand.kt
View File

@ -181,8 +181,8 @@ internal class TestCommand {
@Test @Test
fun `composite command descriptors`() { fun `composite command descriptors`() {
val overloads = TestCompositeCommand.overloads val overloads = TestCompositeCommand.overloads
assertEquals("CommandSignatureVariant(<mute>, seconds: Int = ...)", overloads[0].toString()) assertEquals("CommandSignature(<mute>, seconds: Int = ...)", overloads[0].toString())
assertEquals("CommandSignatureVariant(<mute>, target: Long, seconds: Int)", overloads[1].toString()) assertEquals("CommandSignature(<mute>, target: Long, seconds: Int)", overloads[1].toString())
} }
@Test @Test