Skip to content

Commit 07f7174

Browse files
authored
Fix flags not tab-completing unless string is empty (#460)
1 parent 7efbec3 commit 07f7174

2 files changed

Lines changed: 39 additions & 6 deletions

File tree

cloud-core/src/main/java/cloud/commandframework/CommandTree.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import cloud.commandframework.permission.CommandPermission;
4343
import cloud.commandframework.permission.OrPermission;
4444
import cloud.commandframework.types.tuples.Pair;
45-
import io.leangen.geantyref.GenericTypeReflector;
4645
import io.leangen.geantyref.TypeToken;
4746
import java.util.ArrayList;
4847
import java.util.Arrays;
@@ -631,10 +630,6 @@ private CommandTree(final @NonNull CommandManager<C> commandManager) {
631630
if (!lastFlag.isPresent()) {
632631
commandContext.remove(FlagArgument.FLAG_META_KEY);
633632
}
634-
} else if (GenericTypeReflector.erase(child.getValue().getValueType().getType()).isArray()) {
635-
while (commandQueue.size() > 1) {
636-
commandQueue.remove();
637-
}
638633
} else if (commandQueue.size() <= child.getValue().getParser().getRequestedArgumentCount()) {
639634
for (int i = 0; i < child.getValue().getParser().getRequestedArgumentCount() - 1
640635
&& commandQueue.size() > 1; i++) {
@@ -654,7 +649,7 @@ private CommandTree(final @NonNull CommandManager<C> commandManager) {
654649
} else if (child.getValue() instanceof CompoundArgument) {
655650
return this.directSuggestions(commandContext, child, ((LinkedList<String>) commandQueue).getLast());
656651
}
657-
} else if (commandQueue.size() == 1 && commandQueue.peek().isEmpty()) {
652+
} else if (commandQueue.size() == 1) {
658653
return this.directSuggestions(commandContext, child, commandQueue.peek());
659654
}
660655

cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
//
2424
package cloud.commandframework;
2525

26+
import cloud.commandframework.arguments.CommandArgument;
2627
import cloud.commandframework.arguments.compound.ArgumentTriplet;
2728
import cloud.commandframework.arguments.parser.ArgumentParseResult;
2829
import cloud.commandframework.arguments.standard.BooleanArgument;
@@ -37,8 +38,10 @@
3738
import java.util.Arrays;
3839
import java.util.Collections;
3940
import java.util.List;
41+
import org.junit.Ignore;
4042
import org.junit.jupiter.api.Assertions;
4143
import org.junit.jupiter.api.BeforeAll;
44+
import org.junit.jupiter.api.Disabled;
4245
import org.junit.jupiter.api.Test;
4346

4447
import static cloud.commandframework.util.TestUtils.createManager;
@@ -635,6 +638,41 @@ void testFlagYieldingStringArrayWithLiberalFlagArgument() {
635638
assertThat(suggestions6).isEmpty();
636639
}
637640

641+
@Test
642+
void testTextFlagCompletion() {
643+
// Arrange
644+
final CommandManager<TestCommandSender> manager = createManager();
645+
manager.setSetting(CommandManager.ManagerSettings.LIBERAL_FLAG_PARSING, true);
646+
manager.command(
647+
manager.commandBuilder("command")
648+
.flag(manager.flagBuilder("flag").withAliases("f")
649+
.withArgument(EnumArgument.of(TestEnum.class, "test")).build())
650+
.flag(manager.flagBuilder("flog").build())
651+
);
652+
653+
// Act
654+
final List<String> suggestions1 = suggest(manager, "command ");
655+
final List<String> suggestions2 = suggest(manager, "command --");
656+
final List<String> suggestions3 = suggest(manager, "command --f");
657+
final List<String> suggestions4 = suggest(manager, "command --fla");
658+
final List<String> suggestions5 = suggest(manager, "command -f");
659+
final List<String> suggestions6 = suggest(manager, "command -");
660+
661+
final List<String> suggestions7 = suggest(manager, "command -f ");
662+
final List<String> suggestions8 = suggest(manager, "command -f b");
663+
664+
// Assert
665+
assertThat(suggestions1).containsExactly("--flag", "--flog", "-f");
666+
assertThat(suggestions2).containsExactly("--flag", "--flog");
667+
assertThat(suggestions3).containsExactly("--flag", "--flog");
668+
assertThat(suggestions4).containsExactly("--flag");
669+
assertThat(suggestions5).containsExactly("-f");
670+
assertThat(suggestions6).containsExactly("--flag", "--flog", "-f");
671+
assertThat(suggestions7).containsExactly("foo", "bar");
672+
assertThat(suggestions8).containsExactly("bar");
673+
}
674+
675+
638676
private List<String> suggest(CommandManager<TestCommandSender> manager, String command) {
639677
return manager.suggest(new TestCommandSender(), command);
640678
}

0 commit comments

Comments
 (0)