Skip to content
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

Jump to bottom

Consider arguments when literal is impermissible #88

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Consider arguments when literal is impermissible #88

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
11 changes: 10 additions & 1 deletion src/main/java/com/mojang/brigadier/tree/CommandNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.suggestion.SuggestionsBuilder;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
Expand Down Expand Up @@ -160,7 +161,15 @@ public Collection<? extends CommandNode<S>> getRelevantNodes(final StringReader
input.setCursor(cursor);
final LiteralCommandNode<S> literal = literals.get(text);
if (literal != null) {
return Collections.singleton(literal);
final int argumentsCount = arguments.size();
if (argumentsCount == 0) {
return Collections.singletonList(literal);
} else {
final Collection<CommandNode<S>> nodes = new ArrayList<>(argumentsCount + 1);
nodes.add(literal); // literals have priority over arguments
nodes.addAll(arguments.values());
return nodes;
}
} else {
return arguments.values();
}
Expand Down
42 changes: 42 additions & 0 deletions src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -256,6 +257,47 @@ public void testExecuteAmbiguiousParentSubcommandViaRedirect() throws Exception
verify(command, never()).run(any());
}

@SuppressWarnings("unchecked")
@Test
public void testPreferExecuteLiteralOverArguments() throws Exception {
final Command<Object> literalCommand = mock(Command.class);
when(literalCommand.run(any())).thenReturn(100);

subject.register(
literal("test")
.then(
argument("incorrect", StringArgumentType.word())
.executes(command)
)
.then(
literal("hello")
.executes(literalCommand)
)
);

assertThat(subject.execute("test hello", source), is(100));
verify(literalCommand).run(any(CommandContext.class));
verify(command, never()).run(any());
}

@SuppressWarnings("unchecked")
@Test
public void testExecuteAmbiguousArgumentIfImpermissibleLiteral() throws Exception {
subject.register(literal("foo")
.then(
literal("bar")
.requires(source -> false)
)
.then(
argument("argument", StringArgumentType.word())
.executes(command)
)
);

assertThat(subject.execute("foo bar", source), is(42));
verify(command).run(any(CommandContext.class));
}

@SuppressWarnings("unchecked")
@Test
public void testExecuteRedirectedMultipleTimes() throws Exception {
Expand Down