worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tab completion inconsistencies caused by argument rewrites - closes #481

Browse Source
This commit is contained in:
Luck 2017-09-20 20:27:46 +01:00
parent a9ed4686dd
commit 1d1cd679dd
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java
View File

@ -139,7 +139,7 @@ public class CommandManager {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private CommandResult execute(Sender sender, String label, List<String> args) { private CommandResult execute(Sender sender, String label, List<String> args) {
List<String> arguments = new ArrayList<>(args); List<String> arguments = new ArrayList<>(args);
handleRewrites(arguments); handleRewrites(arguments, true);
// Handle no arguments // Handle no arguments
if (arguments.size() == 0) { if (arguments.size() == 0) {
@ -200,7 +200,7 @@ public class CommandManager {
List<String> arguments = new ArrayList<>(args); List<String> arguments = new ArrayList<>(args);
// we rewrite tab completions too! // we rewrite tab completions too!
handleRewrites(arguments); handleRewrites(arguments, false);
final List<Command> mains = mainCommands.stream() final List<Command> mains = mainCommands.stream()
.filter(Command::shouldDisplay) .filter(Command::shouldDisplay)
@ -211,7 +211,7 @@ public class CommandManager {
if (arguments.size() <= 1) { if (arguments.size() <= 1) {
// Nothing yet entered // Nothing yet entered
if (arguments.isEmpty() || arguments.get(0).equalsIgnoreCase("")) { if (arguments.isEmpty() || arguments.get(0).equals("")) {
return mains.stream() return mains.stream()
.map(m -> m.getName().toLowerCase()) .map(m -> m.getName().toLowerCase())
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -227,8 +227,7 @@ public class CommandManager {
// Find a main command matching the first arg // Find a main command matching the first arg
Optional<Command> o = mains.stream() Optional<Command> o = mains.stream()
.filter(m -> m.getName().equalsIgnoreCase(arguments.get(0))) .filter(m -> m.getName().equalsIgnoreCase(arguments.get(0)))
.limit(1) .findFirst();
.findAny();
arguments.remove(0); // remove the main command arg. arguments.remove(0); // remove the main command arg.
@ -303,9 +302,15 @@ public class CommandManager {
return CommandResult.FAILURE; return CommandResult.FAILURE;
} }
private static void handleRewrites(List<String> args) { /**
* Handles aliases
*
* @param args the current args list
* @param rewriteLastArgument if the last argument should be rewritten - this is false when the method is called on tab completions
*/
private static void handleRewrites(List<String> args, boolean rewriteLastArgument) {
// Provide aliases // Provide aliases
if (args.size() >= 1) { if (args.size() >= 1 && (rewriteLastArgument || args.size() >= 2)) {
if (args.get(0).equalsIgnoreCase("u")) { if (args.get(0).equalsIgnoreCase("u")) {
args.remove(0); args.remove(0);
args.add(0, "user"); args.add(0, "user");
@ -324,7 +329,7 @@ public class CommandManager {
} }
} }
if (args.size() >= 3) { if (args.size() >= 3 && (rewriteLastArgument || args.size() >= 4)) {
if (!args.get(0).equalsIgnoreCase("user") && !args.get(0).equalsIgnoreCase("group")) { if (!args.get(0).equalsIgnoreCase("user") && !args.get(0).equalsIgnoreCase("group")) {
return; return;
} }
@ -441,7 +446,7 @@ public class CommandManager {
// provide lazy info // provide lazy info
boolean lazyInfo = ( boolean lazyInfo = (
args.size() >= 4 && args.size() >= 4 && (rewriteLastArgument || args.size() >= 5) &&
(args.get(2).equalsIgnoreCase("permission") || args.get(2).equalsIgnoreCase("parent") || args.get(2).equalsIgnoreCase("meta")) && (args.get(2).equalsIgnoreCase("permission") || args.get(2).equalsIgnoreCase("parent") || args.get(2).equalsIgnoreCase("meta")) &&
(args.get(3).equalsIgnoreCase("i") || args.get(3).equalsIgnoreCase("about")) (args.get(3).equalsIgnoreCase("i") || args.get(3).equalsIgnoreCase("about"))
); );
@ -453,7 +458,7 @@ public class CommandManager {
// Provide lazy set rewrite // Provide lazy set rewrite
boolean lazySet = ( boolean lazySet = (
args.size() >= 6 && args.size() >= 6 && (rewriteLastArgument || args.size() >= 7) &&
args.get(2).equalsIgnoreCase("permission") && args.get(2).equalsIgnoreCase("permission") &&
args.get(3).toLowerCase().startsWith("set") && args.get(3).toLowerCase().startsWith("set") &&
(args.get(5).equalsIgnoreCase("none") || args.get(5).equalsIgnoreCase("0")) (args.get(5).equalsIgnoreCase("none") || args.get(5).equalsIgnoreCase("0"))

7
common/src/main/java/me/lucko/luckperms/common/commands/abstraction/MainCommand.java
View File

@ -119,7 +119,7 @@ public abstract class MainCommand<T, I> extends Command<Void, T> {
final List<String> objects = getTargets(plugin); final List<String> objects = getTargets(plugin);
if (args.size() <= 1) { if (args.size() <= 1) {
if (args.isEmpty() || args.get(0).equalsIgnoreCase("")) { if (args.isEmpty() || args.get(0).equals("")) {
return objects; return objects;
} }
@ -133,7 +133,7 @@ public abstract class MainCommand<T, I> extends Command<Void, T> {
.collect(Collectors.toList()); .collect(Collectors.toList());
if (args.size() == 2) { if (args.size() == 2) {
if (args.get(1).equalsIgnoreCase("")) { if (args.get(1).equals("")) {
return subs.stream() return subs.stream()
.map(m -> m.getName().toLowerCase()) .map(m -> m.getName().toLowerCase())
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -147,8 +147,7 @@ public abstract class MainCommand<T, I> extends Command<Void, T> {
Optional<Command<T, ?>> o = subs.stream() Optional<Command<T, ?>> o = subs.stream()
.filter(s -> s.getName().equalsIgnoreCase(args.get(1))) .filter(s -> s.getName().equalsIgnoreCase(args.get(1)))
.limit(1) .findFirst();
.findAny();
if (!o.isPresent()) { if (!o.isPresent()) {
return Collections.emptyList(); return Collections.emptyList();