Consider arguments when literal is impermissible

Fixes Mojang#87
hugmanrique · Apr 3, 2021 · 862239b · 862239b
1 parent cf754c4
commit 862239b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java
@@ -354,7 +354,7 @@ private ParseResults<S> parseNodes(final CommandNode<S> node, final StringReader
         List<ParseResults<S>> potentials = null;
         final int cursor = originalReader.getCursor();
 
-        for (final CommandNode<S> child : node.getRelevantNodes(originalReader)) {
+        for (final CommandNode<S> child : node.getRelevantNodes(originalReader, source)) {
             if (!child.canUse(source)) {
                 continue;
             }

diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
@@ -151,6 +151,11 @@ public Predicate<S> getRequirement() {
     protected abstract String getSortedKey();
 
     public Collection<? extends CommandNode<S>> getRelevantNodes(final StringReader input) {
+        return this.getRelevantNodes(input, null);
+    }
+
+    public Collection<? extends CommandNode<S>> getRelevantNodes(final StringReader input,
+                                                                 final S source) {
         if (literals.size() > 0) {
             final int cursor = input.getCursor();
             while (input.canRead() && input.peek() != ' ') {
@@ -159,7 +164,7 @@ public Collection<? extends CommandNode<S>> getRelevantNodes(final StringReader
             final String text = input.getString().substring(cursor, input.getCursor());
             input.setCursor(cursor);
             final LiteralCommandNode<S> literal = literals.get(text);
-            if (literal != null) {
+            if (literal != null && (source == null || literal.canUse(source))) {
                 return Collections.singleton(literal);
             } else {
                 return arguments.values();

diff --git a/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java b/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
@@ -4,6 +4,7 @@
 package com.mojang.brigadier;
 
 import com.google.common.collect.Lists;
+import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.context.CommandContextBuilder;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -228,6 +229,27 @@ public void testExecuteAmbiguiousParentSubcommand() throws Exception {
         verify(command, never()).run(any());
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testExecuteAmbiguousArgumentImpermissibleLiteral() throws Exception {
+        final Command<Object> command = mock(Command.class);
+        when(command.run(any())).thenReturn(100);
+
+        subject.register(literal("foo")
+            .then(
+                literal("bar")
+                    .requires(source -> false)
+            )
+            .then(
+                argument("argument", StringArgumentType.word())
+                    .executes(command)
+            )
+        );
+
+        assertThat(subject.execute("foo bar", source), is(100));
+        verify(command).run(any(CommandContext.class));
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     public void testExecuteAmbiguiousParentSubcommandViaRedirect() throws Exception {