Correctly map Brigadier suggestions to cloud

jpenilla · jpenilla · commit 19865177aa3c · 2023-12-26T15:29:07.000-08:00
cloud expects the suggestion to be a replacement for the entire argument, use Brigadier's range information to meet that requirement.
diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/argument/WrappedBrigadierParser.java
@@ -37,7 +37,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 import org.apiguardian.api.API;
@@ -173,27 +172,36 @@ public final ArgumentType<T> getNativeArgument() {
          */
         final com.mojang.brigadier.context.CommandContext<Object> reverseMappedContext = new com.mojang.brigadier.context.CommandContext<>(
                 commandContext.getOrDefault(COMMAND_CONTEXT_BRIGADIER_NATIVE_SENDER, commandContext.sender()),
-                commandContext.rawInput().input(),
+                input.input(),
                 Collections.emptyMap(),
                 null,
                 null,
                 Collections.emptyList(),
-                StringRange.at(0),
+                StringRange.at(input.cursor()),
                 null,
                 null,
                 false
         );
 
         return this.nativeType.get().listSuggestions(
                 reverseMappedContext,
-                new SuggestionsBuilder(input.input(), input.input().toLowerCase(Locale.ROOT), input.cursor())
+                new SuggestionsBuilder(input.input(), input.cursor())
         ).thenApply(suggestions -> {
             final List<cloud.commandframework.arguments.suggestion.Suggestion> cloud = new ArrayList<>();
             for (final com.mojang.brigadier.suggestion.Suggestion suggestion : suggestions.getList()) {
-                cloud.add(tooltipSuggestion(
-                        suggestion.getText(),
-                        suggestion.getTooltip()
-                ));
+                final String beforeSuggestion = input.input().substring(input.cursor(), suggestion.getRange().getStart());
+                final String afterSuggestion = input.input().substring(suggestion.getRange().getEnd());
+                if (beforeSuggestion.isEmpty() && afterSuggestion.isEmpty()) {
+                    cloud.add(tooltipSuggestion(
+                            suggestion.getText(),
+                            suggestion.getTooltip()
+                    ));
+                } else {
+                    cloud.add(tooltipSuggestion(
+                            beforeSuggestion + suggestion.getText() + afterSuggestion,
+                            suggestion.getTooltip()
+                    ));
+                }
             }
             return cloud;
         });
