From c6c2eff8f70b7108f859c207ebcfb23cc8304287 Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 17 Feb 2022 18:19:35 +0000 Subject: [PATCH] Give built-in providers with priority -1 --- .../src/command/parse/SpaceSeparatedCommandCallParser.kt | 1 + .../src/command/resolve/BuiltInCommandCallResolver.kt | 1 + .../src/internal/permission/BuiltInPermissionServices.kt | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mirai-console/backend/mirai-console/src/command/parse/SpaceSeparatedCommandCallParser.kt b/mirai-console/backend/mirai-console/src/command/parse/SpaceSeparatedCommandCallParser.kt index f2496d635..785d9444f 100644 --- a/mirai-console/backend/mirai-console/src/command/parse/SpaceSeparatedCommandCallParser.kt +++ b/mirai-console/backend/mirai-console/src/command/parse/SpaceSeparatedCommandCallParser.kt @@ -26,6 +26,7 @@ public object SpaceSeparatedCommandCallParser : CommandCallParser { @ExperimentalCommandDescriptors public object Provider : CommandCallParserProvider { override val instance: CommandCallParser get() = SpaceSeparatedCommandCallParser + override val priority: Int get() = -1 } override fun parse(caller: CommandSender, message: MessageChain): CommandCall? { diff --git a/mirai-console/backend/mirai-console/src/command/resolve/BuiltInCommandCallResolver.kt b/mirai-console/backend/mirai-console/src/command/resolve/BuiltInCommandCallResolver.kt index 898888204..1c7d68636 100644 --- a/mirai-console/backend/mirai-console/src/command/resolve/BuiltInCommandCallResolver.kt +++ b/mirai-console/backend/mirai-console/src/command/resolve/BuiltInCommandCallResolver.kt @@ -31,6 +31,7 @@ public object BuiltInCommandCallResolver : CommandCallResolver { internal object Provider : CommandCallResolverProvider { override val instance: CommandCallResolver = BuiltInCommandCallResolver + override val priority: Int get() = -1 } override fun resolve(call: CommandCall): CommandResolveResult { diff --git a/mirai-console/backend/mirai-console/src/internal/permission/BuiltInPermissionServices.kt b/mirai-console/backend/mirai-console/src/internal/permission/BuiltInPermissionServices.kt index 3c320c514..5cedab49f 100644 --- a/mirai-console/backend/mirai-console/src/internal/permission/BuiltInPermissionServices.kt +++ b/mirai-console/backend/mirai-console/src/internal/permission/BuiltInPermissionServices.kt @@ -102,9 +102,8 @@ internal class BuiltInPermissionService : AbstractConcurrentPermissionService { class Provider : PermissionServiceProvider { - override val instance: PermissionService<*> by lazy { - BuiltInPermissionService() - } + override val instance: PermissionService<*> by lazy { BuiltInPermissionService() } + override val priority: Int get() = -1 } override val permissionType: KClass