Skip to content

fix: correct command tab completion #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanbarlow97 merged 1 commit into from
Oct 15, 2026
Merged

fix: correct command tab completion #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/main/java/net/tfminecraft/marketblock/manager/commands/TabCompletion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;

import java.util.ArrayList;
import java.util.List;
import java.util.Locale;

public class TabCompletion implements TabCompleter {

Expand All @@ -19,20 +21,22 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
if (!sender.hasPermission(CommandManager.ADMIN_PERMISSION)) return completions;

if (args.length == 1) {
String prefix = args[0].toLowerCase();
String prefix = args[0].toLowerCase(Locale.ROOT);
for (String sub : new String[] { "add", "delete", "reload", "reset", "resetall" }) {
if (!(sender instanceof Player) && !sub.equals("reload")) continue;
if (sub.startsWith(prefix)) {
completions.add(sub);
}
}
return completions;
}

if (args.length == 2 && args[0].equalsIgnoreCase("delete")) {
completions.addAll(TradeLoader.getTrades().keySet());
}
if (args.length == 2 && args[0].equalsIgnoreCase("reset")) {
completions.addAll(TradeLoader.getTrades().keySet());
if (sender instanceof Player && args.length == 2
&& (args[0].equalsIgnoreCase("delete") || args[0].equalsIgnoreCase("reset"))) {
String prefix = args[1].toLowerCase(Locale.ROOT);
for (String id : TradeLoader.getTrades().keySet()) {
if (id.toLowerCase(Locale.ROOT).startsWith(prefix)) completions.add(id);
}
}

return completions;
Expand Down
17 changes: 14 additions & 3 deletions src/test/java/net/tfminecraft/marketblock/manager/MarketCommandsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,21 @@ void completionRespectsCommandPermissionPrefixAndTradeArguments() {
when(command.getName()).thenReturn("marketblock");
assertTrue(completion.onTabComplete(sender, command, "", new String[] {""}).isEmpty());
when(sender.hasPermission(CommandManager.ADMIN_PERMISSION)).thenReturn(true);
assertEquals(List.of("reload", "reset", "resetall"), completion.onTabComplete(sender, command, "", new String[] {"RE"}));
assertEquals(List.of("reload"), completion.onTabComplete(sender, command, "", new String[] {"RE"}));
assertEquals(List.of("reload"), completion.onTabComplete(sender, command, "", new String[] {""}));
var player = server.addPlayer();
player.setOp(true);
assertEquals(List.of("reload", "reset", "resetall"), completion.onTabComplete(player, command, "", new String[] {"RE"}));
TradeLoader.getTrades().put("oak", new Trade("oak", new Category(), 2, 20, 1, "v.oak_log", 2, 64, 0));
assertEquals(List.of("oak"), completion.onTabComplete(sender, command, "", new String[] {"delete", ""}));
assertEquals(List.of("oak"), completion.onTabComplete(sender, command, "", new String[] {"reset", ""}));
assertEquals(List.of("oak"), completion.onTabComplete(player, command, "", new String[] {"delete", ""}));
assertEquals(List.of("oak"), completion.onTabComplete(player, command, "", new String[] {"reset", ""}));
TradeLoader.getTrades().put("Iron", new Trade("Iron", new Category(), 2, 20, 1, "v.iron_ingot", 2, 64, 0));
for (String action : List.of("delete", "reset")) {
assertEquals(List.of("oak"), completion.onTabComplete(player, command, "", new String[] {action, "O"}));
assertEquals(List.of("Iron"), completion.onTabComplete(player, command, "", new String[] {action, "ir"}));
assertTrue(completion.onTabComplete(player, command, "", new String[] {action, "zzz"}).isEmpty());
assertTrue(completion.onTabComplete(sender, command, "", new String[] {action, ""}).isEmpty());
}
assertTrue(completion.onTabComplete(sender, command, "", new String[] {"add", ""}).isEmpty());
assertTrue(completion.onTabComplete(sender, command, "", new String[0]).isEmpty());
assertTrue(completion.onTabComplete(sender, command, "", new String[] {"reset", "oak", "extra"}).isEmpty());
Expand Down
Loading