command script tab completions: auto reduce for startsWith

DenizenScript · Dec 27, 2020 · f728e09 · f728e09
1 parent 28b52c4
commit f728e09
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...c/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptContainer.java b/...c/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptContainer.java
@@ -236,15 +236,20 @@ public List<String> runTabCompleteProcedure(PlayerTag player, NPCTag npc, Map<St
             tagContext.contextSource = oecs;
             contextSrc = oecs;
         }
-        ListTag list = new ListTag();
+        List<String> list = new ArrayList<>();
         if (tabCompletionTaggables != null) {
             int argCount = Math.max(originalArguments.length, 1);
             String taggable = tabCompletionTaggables.get(argCount);
             if (taggable == null) {
                 taggable = tabCompletionTaggables.get(-1);
             }
             if (taggable != null) {
-                list.addAll(ListTag.getListFor(TagManager.tagObject(taggable, tagContext), tagContext));
+                String argLow = originalArguments.length == 0 ? "" : CoreUtilities.toLowerCase(originalArguments[originalArguments.length - 1]);
+                for (String value : ListTag.getListFor(TagManager.tagObject(taggable, tagContext), tagContext)) {
+                    if (CoreUtilities.toLowerCase(value).startsWith(argLow)) {
+                        list.add(value);
+                    }
+                }
             }
         }
         if (hasProcStyleTabComplete) {