Improve the behavior of SuggestionProvider.compose

Revxrsal · Oct 12, 2022 · 75e80f3 · 75e80f3
1 parent 451c6d6
commit 75e80f3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/common/src/main/java/revxrsal/commands/autocomplete/SuggestionProvider.java b/common/src/main/java/revxrsal/commands/autocomplete/SuggestionProvider.java
@@ -48,6 +48,9 @@ Collection<String> getSuggestions(@NotNull List<String> args,
     @Contract("null -> this; !null -> new")
     default SuggestionProvider compose(@Nullable SuggestionProvider other) {
         if (other == null) return this;
+        if (this == EMPTY && other == EMPTY) return EMPTY;
+        if (other == EMPTY) return this;
+        if (this == EMPTY) return other;
         return (args, sender, command) -> {
             Set<String> completions = new HashSet<>(other.getSuggestions(args, sender, command));
             completions.addAll(getSuggestions(args, sender, command));