add command tab completer

Author: makeevrserg

command-bukkit/src/main/kotlin/ru/astrainteractive/astralibs/command/api/command/BukkitTabCompleter.kt

@@ -0,0 +1,10 @@
+package ru.astrainteractive.astralibs.command.api.command
+
+import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
+
+/**
+ * Can be used for testing purposes
+ */
+fun interface BukkitTabCompleter {
+    fun onTabComplete(ctx: BukkitCommandContext): List<String>
+}

command-bukkit/src/main/kotlin/ru/astrainteractive/astralibs/command/api/util/PluginExt.kt

@@ -1,51 +1,64 @@
 package ru.astrainteractive.astralibs.command.api.util
 
 import org.bukkit.plugin.java.JavaPlugin
+import ru.astrainteractive.astralibs.command.api.command.BukkitTabCompleter
 import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
 import ru.astrainteractive.astralibs.command.api.error.ErrorHandler
 import ru.astrainteractive.astralibs.command.api.executor.CommandExecutor
 import ru.astrainteractive.astralibs.command.api.parser.CommandParser
 
 object PluginExt {
-    fun <T : Any> JavaPlugin.registerCommand(
+    fun <T : Any> JavaPlugin.setCommandExecutor(
         alias: String,
         commandParser: CommandParser<T, BukkitCommandContext>,
         commandExecutor: CommandExecutor<T>,
         errorHandler: ErrorHandler<BukkitCommandContext>
     ) {
-        val javaCommand = getCommand(alias) ?: error("Command with alias $alias not found")
-        javaCommand.setExecutor { sender, bukkitCommand, label, args ->
-            val commandContext = BukkitCommandContext(
+        val pluginCommand = getCommand(alias) ?: error("Command with alias $alias not found")
+        pluginCommand.setExecutor { sender, bukkitCommand, label, args ->
+            val ctx = BukkitCommandContext(
                 sender = sender,
                 command = bukkitCommand,
                 label = label,
                 args = args
             )
-            val parseResult = runCatching {
-                commandParser.parse(commandContext)
-            }
-            parseResult.onFailure { throwable ->
-                errorHandler.handle(commandContext, throwable)
-            }
-            parseResult.onSuccess(commandExecutor::execute)
+            runCatching { commandParser.parse(ctx) }
+                .onFailure { throwable -> errorHandler.handle(ctx, throwable) }
+                .onSuccess(commandExecutor::execute)
             true
         }
     }
 
     fun JavaPlugin.setCommandExecutor(
         alias: String,
         commandExecutor: CommandExecutor<BukkitCommandContext>,
+        errorHandler: ErrorHandler<BukkitCommandContext>
     ) {
         val javaCommand = getCommand(alias) ?: error("Command with alias $alias not found")
         javaCommand.setExecutor { sender, bukkitCommand, label, args ->
-            val commandContext = BukkitCommandContext(
+            val ctx = BukkitCommandContext(
                 sender = sender,
                 command = bukkitCommand,
                 label = label,
                 args = args
             )
-            commandExecutor.execute(commandContext)
+            runCatching { commandExecutor.execute(ctx) }
+                .onFailure { errorHandler.handle(ctx, it) }
             true
         }
     }
+
+    @Suppress("UnusedPrivateMember")
+    private fun JavaPlugin.setCommandTabCompleter(alias: String, tabCompleter: BukkitTabCompleter) {
+        val pluginCommand = getCommand(alias) ?: error("Command $alias not found!")
+        pluginCommand.setTabCompleter { commandSender, command, label, args ->
+            val ctx = BukkitCommandContext(
+                sender = commandSender,
+                command = command,
+                label = label,
+                args = args
+            )
+            tabCompleter.onTabComplete(ctx)
+        }
+    }
 }

command/src/main/kotlin/ru/astrainteractive/astralibs/command/api/error/ErrorHandler.kt

@@ -3,5 +3,5 @@ package ru.astrainteractive.astralibs.command.api.error
 import ru.astrainteractive.astralibs.command.api.context.CommandContext
 
 fun interface ErrorHandler<CC : CommandContext> {
-    fun handle(commandContext: CC, throwable: Throwable)
+    fun handle(ctx: CC, throwable: Throwable)
 }

command/src/main/kotlin/ru/astrainteractive/astralibs/command/api/parser/CommandParser.kt

@@ -12,5 +12,5 @@ fun interface CommandParser<R : Any, CC : CommandContext> {
      * Parse arguments into Result [R]
      */
     @Throws(CommandException::class)
-    fun parse(commandContext: CC): R
+    fun parse(ctx: CC): R
 }

gradle.properties

@@ -9,7 +9,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraLibs
 makeevrserg.project.group=ru.astrainteractive.astralibs
-makeevrserg.project.version.string=3.18.2
+makeevrserg.project.version.string=3.19.0
 makeevrserg.project.description=Core utilities for spigot development
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru