zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

🐛 Fix brigadier suggestion building

Browse source 
An offset will be added pointing to the last occurrence of a blank space. This fixes incorrect tab completions for greedy strings
This commit is contained in:
Alexander Söderberg 2020-10-13 19:53:01 +02:00
parent 5f466fcbc0
commit 06a34651bf
No known key found for this signature in database
GPG key ID: FACEA5B0F4C1BF80
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java
View file

@ -30,7 +30,9 @@ import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
/**
* A flag is an optional command argument that may have an associated parser,
@ -160,7 +162,19 @@ public final class CommandFlag<T> {
* @return New builder instance
*/
public Builder<T> withAliases(final @NonNull String... aliases) {
return new Builder<>(this.name, aliases, this.description, this.commandArgument);
final Set<String> filteredAliases = new HashSet<>();
for (final String alias : aliases) {
if (alias.isEmpty()) {
continue;
}
filteredAliases.add(alias);
}
return new Builder<>(
this.name,
filteredAliases.toArray(new String[0]),
this.description,
this.commandArgument
);
}
/**

12
cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java
View file

@ -456,6 +456,13 @@ public final class CloudBrigadierManager<C, S> {
command
);
SuggestionsBuilder suggestionsBuilder = builder;
final int lastIndexOfSpaceInRemainingString = builder.getRemaining().lastIndexOf(' ');
if (lastIndexOfSpaceInRemainingString != -1) {
suggestionsBuilder = builder.createOffset(builder.getStart() + lastIndexOfSpaceInRemainingString + 1);
}
for (final String suggestion : suggestions) {
String tooltip = argument.getName();
if (!(argument instanceof StaticArgument)) {
@ -465,9 +472,10 @@ public final class CloudBrigadierManager<C, S> {
tooltip = '[' + tooltip + ']';
}
}
builder.suggest(suggestion, new LiteralMessage(tooltip));
suggestionsBuilder = suggestionsBuilder.suggest(suggestion, new LiteralMessage(tooltip));
}
return builder.buildFuture();
return suggestionsBuilder.buildFuture();
}
}

1
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCaptionKeys.java
View file

@ -34,6 +34,7 @@ import java.util.LinkedList;
* {@link Caption} instances for messages in cloud-bukkit
*/
public final class BukkitCaptionKeys {
private static final Collection<Caption> RECOGNIZED_CAPTIONS = new LinkedList<>();
/**