ChomeNS/brigadier
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed from failing prematurely on partially matching literals

Browse source
This commit is contained in:
Nathan Adams 2017-08-07 09:24:14 +02:00
parent 2d7644dce3
commit 78f4187908
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/mojang/brigadier/CommandDispatcher.java
View file

@ -94,6 +94,11 @@ public class CommandDispatcher<S> {
final int cursor = reader.getCursor();
try {
child.parse(reader, context);
if (reader.canRead()) {
if (reader.peek() != ARGUMENT_SEPARATOR_CHAR) {
throw ERROR_EXPECTED_ARGUMENT_SEPARATOR.createWithContext(reader);
}
}
} catch (final CommandException ex) {
errors.put(child, ex);
reader.setCursor(cursor);
@ -102,9 +107,6 @@ public class CommandDispatcher<S> {
context.withCommand(child.getCommand());
if (reader.canRead()) {
if (reader.peek() != ARGUMENT_SEPARATOR_CHAR) {
throw ERROR_EXPECTED_ARGUMENT_SEPARATOR.createWithContext(reader);
}
reader.skip();
if (child.getRedirect() != null) {
return parseNodes(child.getRedirect(), reader, context.redirect());

12
src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
View file

@ -22,6 +22,7 @@ import static org.junit.Assert.fail;
import static org.mockito.Matchers.notNull;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -207,6 +208,17 @@ public class CommandDispatcherTest {
}
}
@Test
public void testExecute_invalidOther() throws Exception {
final Command<Object> wrongCommand = mock(Command.class);
subject.register(literal("w").executes(wrongCommand));
subject.register(literal("world").executes(command));
assertThat(subject.execute("world", source), is(42));
verify(wrongCommand, never()).run(any());
verify(command).run(any());
}
@Test
public void parse_noSpaceSeparator() throws Exception {
subject.register(literal("foo").then(argument("bar", integer()).executes(command)));