Fix suggestions on Bukkit for good

EngineHub · Jul 28, 2019 · 76b608f · 76b608f
1 parent 3a5170a
commit 76b608f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
@@ -335,7 +335,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
         // code of WorldEdit expects it
         String[] split = new String[args.length + 1];
         System.arraycopy(args, 0, split, 1, args.length);
-        split[0] = "/" + cmd.getName();
+        split[0] = "/" + commandLabel;
 
         CommandEvent event = new CommandEvent(wrapCommandSender(sender), Joiner.on(" ").join(split));
         getWorldEdit().getEventBus().post(event);
@@ -349,7 +349,7 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String comm
         // code of WorldEdit expects it
         String[] split = new String[args.length + 1];
         System.arraycopy(args, 0, split, 1, args.length);
-        split[0] = "/" + cmd.getName();
+        split[0] = "/" + commandLabel;
 
         String arguments = Joiner.on(" ").join(split);
         CommandSuggestionEvent event = new CommandSuggestionEvent(wrapCommandSender(sender), arguments);

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandUtil.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandUtil.java
@@ -21,7 +21,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
 import com.sk89q.worldedit.extension.platform.PlatformCommandManager;
 import com.sk89q.worldedit.internal.util.Substring;
 import com.sk89q.worldedit.util.formatting.text.Component;
@@ -70,18 +69,29 @@ public static List<String> fixSuggestions(String arguments, List<Substring> sugg
             CommandArgParser.spaceSplit(arguments)
         );
         return suggestions.stream()
+            // Re-map suggestions to only operate on the last non-quoted word
+            .map(CommandUtil::onlyOnLastQuotedWord)
             .map(suggestion -> CommandUtil.suggestLast(lastArg, suggestion))
             .filter(Optional::isPresent)
             .map(Optional::get)
             .collect(toList());
     }
 
+    private static Substring onlyOnLastQuotedWord(Substring suggestion) {
+        String substr = suggestion.getSubstring();
+        int sp = substr.lastIndexOf(' ');
+        if (sp < 0) {
+            return suggestion;
+        }
+        return Substring.wrap(substr.substring(sp + 1), suggestion.getStart() + sp + 1, suggestion.getEnd());
+    }
+
     /**
      * Given the last word of a command, mutate the suggestion to replace the last word, if
      * possible.
      */
     private static Optional<String> suggestLast(Substring last, Substring suggestion) {
-        if (suggestion.getStart() == last.getEnd()) {
+        if (suggestion.getStart() == last.getEnd() && !last.getSubstring().equals("\"")) {
             // this suggestion is for the next argument.
             if (last.getSubstring().isEmpty()) {
                 return Optional.of(suggestion.getSubstring());