Skip to content

Commit 547db77

Browse files
committed
improved rename command auto-completion
1 parent 16ab910 commit 547db77

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/main/kotlin/me/apyr/chatemotes/EventListener.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class EventListener : Listener {
5151
return
5252
}
5353

54-
val emotes: Map<String, Emote> = plugin.emotes.takeIf { it.isNotEmpty() } ?: return
55-
e.message = formatMessage(e.message, emotes)
54+
e.message = formatMessage(e.message, plugin.emotes.takeIf { it.isNotEmpty() } ?: return)
5655
}
5756

5857
@EventHandler

src/main/kotlin/me/apyr/chatemotes/commands/RenameCommand.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,14 @@ class RenameCommand : ChatEmotesCommand {
4949

5050
override fun onTabComplete(sender: CommandSender, args: List<String>): List<String> {
5151
return when {
52-
args.size == 1 && args[0].isEmpty() -> ChatEmotes.getInstance().emotes.values.map { it.name }
52+
args.size == 1 -> ChatEmotes.getInstance().emotes.values.let { emotes ->
53+
val term: String? = args.firstOrNull()?.takeIf { it.isNotEmpty() }
54+
if (term != null) {
55+
emotes.filter { e -> e.name.contains(term, ignoreCase = true) }
56+
} else {
57+
emotes
58+
}
59+
}.map { it.name }
5360
args.size == 2 && args[1].isEmpty() -> listOf("<new>")
5461
else -> emptyList()
5562
}

0 commit comments

Comments
 (0)