github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-25 19:50:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix subCommandNames

Browse Source
This commit is contained in:
Him188 2020-10-30 11:23:55 +08:00
parent f7c8534b4e
commit 80e869e8c9
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/mirai-console/src/internal/command/CommandReflector.kt
View File

@ -66,7 +66,7 @@ internal object SimpleCommandSubCommandAnnotationResolver :
function.hasAnnotation<SimpleCommand.Handler>() function.hasAnnotation<SimpleCommand.Handler>()
override fun getSubCommandNames(ownerCommand: Command, function: KFunction<*>): Array<out String> = override fun getSubCommandNames(ownerCommand: Command, function: KFunction<*>): Array<out String> =
ownerCommand.secondaryNames emptyArray()
override fun getAnnotatedName(ownerCommand: Command, parameter: KParameter): String? = override fun getAnnotatedName(ownerCommand: Command, parameter: KParameter): String? =
parameter.findAnnotation<SimpleCommand.Name>()?.value parameter.findAnnotation<SimpleCommand.Name>()?.value
@ -228,10 +228,16 @@ internal class CommandReflector(
.onEach { it.checkExtensionReceiver() } .onEach { it.checkExtensionReceiver() }
.onEach { it.checkModifiers() } .onEach { it.checkModifiers() }
.onEach { it.checkNames() } .onEach { it.checkNames() }
.map { function -> .flatMap { function ->
val names = annotationResolver.getSubCommandNames(command, function)
if (names.isEmpty()) sequenceOf(createMapEntry(function, null))
else names.associateBy { function }.asSequence()
}
.map { (function, name) ->
val functionNameAsValueParameter = val functionNameAsValueParameter =
annotationResolver.getSubCommandNames(command, function).mapIndexed { index, s -> createStringConstantParameter(index, s) } name?.split(' ')?.mapIndexed { index, s -> createStringConstantParameter(index, s) }
.orEmpty()
val functionValueParameters = val functionValueParameters =
function.valueParameters.associateBy { it.toUserDefinedCommandParameter() } function.valueParameters.associateBy { it.toUserDefinedCommandParameter() }
@ -274,6 +280,11 @@ internal class CommandReflector(
}.toList() }.toList()
} }
private fun <K, V> createMapEntry(key: K, value: V) = object : Map.Entry<K, V> {
override val key: K get() = key
override val value: V get() = value
}
private fun KParameter.toCommandReceiverParameter(): CommandReceiverParameter<out CommandSender> { private fun KParameter.toCommandReceiverParameter(): CommandReceiverParameter<out CommandSender> {
check(!this.isVararg) { "Receiver cannot be vararg." } check(!this.isVararg) { "Receiver cannot be vararg." }
check(this.type.classifierAsKClass().isSubclassOf(CommandSender::class)) { "Receiver must be subclass of CommandSender" } check(this.type.classifierAsKClass().isSubclassOf(CommandSender::class)) { "Receiver must be subclass of CommandSender" }