chore: make code style consistent
This commit is contained in:
parent
a2cea2f33e
commit
89ec3fbf29
380 changed files with 479 additions and 936 deletions
|
|
@ -45,5 +45,4 @@ public interface BrigadierManagerHolder<C> {
|
|||
* @since 1.2.0
|
||||
*/
|
||||
@Nullable CloudBrigadierManager<C, ?> brigadierManager();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
|
|||
import static java.util.Objects.requireNonNull;
|
||||
|
||||
final class BrigadierMapping<C, K extends ArgumentParser<C, ?>, S> {
|
||||
|
||||
private final boolean cloudSuggestions;
|
||||
private final BrigadierMappingBuilder.@Nullable SuggestionProviderSupplier<K, S> suggestionsOverride;
|
||||
private final @Nullable Function<K, ? extends ArgumentType<?>> mapper;
|
||||
|
|
@ -67,11 +68,15 @@ final class BrigadierMapping<C, K extends ArgumentParser<C, ?>, S> {
|
|||
}
|
||||
return this.suggestionsOverride == null
|
||||
? null
|
||||
: (SuggestionProvider<S>) this.suggestionsOverride.provide(commandArgument, CloudBrigadierManager.delegateSuggestions());
|
||||
: (SuggestionProvider<S>) this.suggestionsOverride.provide(
|
||||
commandArgument,
|
||||
CloudBrigadierManager.delegateSuggestions()
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
static final class BuilderImpl<C, K extends ArgumentParser<C, ?>, S> implements BrigadierMappingBuilder<K, S> {
|
||||
|
||||
private Function<K, ? extends ArgumentType<?>> mapper;
|
||||
private boolean cloudSuggestions = false;
|
||||
private SuggestionProviderSupplier<K, S> suggestionsOverride;
|
||||
|
|
@ -118,6 +123,5 @@ final class BrigadierMapping<C, K extends ArgumentParser<C, ?>, S> {
|
|||
public BrigadierMapping<C, K, S> build() {
|
||||
return new BrigadierMapping<>(this.cloudSuggestions, this.suggestionsOverride, this.mapper);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,7 +114,5 @@ public interface BrigadierMappingBuilder<K extends ArgumentParser<?, ?>, S> {
|
|||
* @since 1.5.0
|
||||
*/
|
||||
@Nullable SuggestionProvider<? super S> provide(@NonNull K argument, SuggestionProvider<S> useCloud);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -357,7 +357,6 @@ public final class CloudBrigadierManager<C, S> {
|
|||
final BrigadierMapping.BuilderImpl<C, K, S> builder = new BrigadierMapping.BuilderImpl<>();
|
||||
configurer.accept(builder);
|
||||
this.mappers.put(GenericTypeReflector.erase(parserType.getType()), builder.build());
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -569,11 +568,11 @@ public final class CloudBrigadierManager<C, S> {
|
|||
);
|
||||
final SuggestionProvider<S> provider = pair.getSecond() == delegateSuggestions()
|
||||
? (context, builder) -> this.buildSuggestions(
|
||||
context,
|
||||
root.getParent(),
|
||||
root.getValue(),
|
||||
builder
|
||||
) : pair.getSecond();
|
||||
context,
|
||||
root.getParent(),
|
||||
root.getValue(),
|
||||
builder
|
||||
) : pair.getSecond();
|
||||
argumentBuilder = RequiredArgumentBuilder
|
||||
.<S, Object>argument(root.getValue().getName(), (ArgumentType<Object>) pair.getFirst())
|
||||
.suggests(provider)
|
||||
|
|
@ -665,5 +664,4 @@ public final class CloudBrigadierManager<C, S> {
|
|||
|
||||
return suggestionsBuilder.buildFuture();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import java.util.Deque;
|
|||
import java.util.Queue;
|
||||
|
||||
final class QueueAsStringReader extends StringReader {
|
||||
|
||||
private boolean closed;
|
||||
private final Queue<String> input;
|
||||
|
||||
|
|
@ -65,5 +66,4 @@ final class QueueAsStringReader extends StringReader {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ public interface StringReaderAsQueue extends Queue<String> {
|
|||
|
||||
/**
|
||||
* Given an existing Brigadier {@code StringReader}, get a view of it as a {@link Queue}
|
||||
*
|
||||
* @param reader the input reader
|
||||
* @return a view of the contents of the reader as a {@link Queue} split by word.
|
||||
*/
|
||||
|
|
@ -205,5 +206,4 @@ public interface StringReaderAsQueue extends Queue<String> {
|
|||
default void clear() { // consume all
|
||||
this.getOriginal().setCursor(this.getOriginal().getTotalLength());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ final class StringReaderAsQueueImpl {
|
|||
* Extending variant is only implementable with Mixin, because of clashing return types on the two interfaces (on `peek`). */
|
||||
|
||||
static final class Wrapping implements StringReaderAsQueue {
|
||||
|
||||
private final StringReader original;
|
||||
private int nextSpaceIdx; /* the character before the start of a new word */
|
||||
private @Nullable String nextWord;
|
||||
|
|
@ -128,7 +129,5 @@ final class StringReaderAsQueueImpl {
|
|||
this.nextWord = null;
|
||||
this.nextSpaceIdx = -1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ public final class WrappedBrigadierParser<C, T> implements ArgumentParser<C, T>
|
|||
* @since 1.5.0
|
||||
*/
|
||||
public WrappedBrigadierParser(
|
||||
final ArgumentType<T> nativeType,
|
||||
final int expectedArgumentCount
|
||||
final ArgumentType<T> nativeType,
|
||||
final int expectedArgumentCount
|
||||
) {
|
||||
this(() -> nativeType, expectedArgumentCount);
|
||||
}
|
||||
|
|
@ -191,5 +191,4 @@ public final class WrappedBrigadierParser<C, T> implements ArgumentParser<C, T>
|
|||
public int getRequestedArgumentCount() {
|
||||
return this.expectedArgumentCount;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,5 +94,4 @@ public class QueueAsStringReaderTest {
|
|||
|
||||
assertEquals(words("pig"), contents);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
|
||||
/**
|
||||
* Tests for {@link StringReaderAsQueue}
|
||||
*
|
||||
* <p>
|
||||
* Most operations have 4 cases: 0 arguments, 1 argument, 2 arguments, and 3 or more arguments.
|
||||
* At that point every whitespace handling path should be exercised.
|
||||
*/
|
||||
|
|
@ -162,7 +162,7 @@ class StringReaderAsQueueTest {
|
|||
@Test
|
||||
void testToArrayMultiple() {
|
||||
final Queue<String> elements = StringReaderAsQueue.from(new StringReader("one two three four"));
|
||||
assertArrayEquals(new String[] { "one", "two", "three", "four" }, elements.toArray());
|
||||
assertArrayEquals(new String[]{"one", "two", "three", "four"}, elements.toArray());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -177,5 +177,4 @@ class StringReaderAsQueueTest {
|
|||
assertEquals(pair.getSecond(), StringReaderAsQueue.from(new StringReader(pair.getFirst())).size());
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue