Check permissions for executors before suggest.

Author: Rollczi

litecommands-core/src/main/java/dev/rollczi/litecommands/implementation/LiteCommandSection.java

@@ -111,18 +111,7 @@ public SuggestionMerger findSuggestion(Invocation<SENDER> invocation, int route)
             }
         }
 
-        root:
-        for (ArgumentExecutor<SENDER> executor : this.executors()) {
-            if (executor.meta().getPermissions().isEmpty()) {
-                continue;
-            }
-
-            for (String permission : executor.meta().getPermissions()) {
-                if (sender.hasPermission(permission)) {
-                    break root;
-                }
-            }
-
+        if (!this.hasPermissionToAnyExecutor(invocation.sender())) {
             return suggestionMerger;
         }
 
@@ -145,6 +134,12 @@ public SuggestionMerger findSuggestion(Invocation<SENDER> invocation, int route)
         LiteInvocation lite = invocation.toLite();
 
         for (ArgumentExecutor<SENDER> argumentExecutor : this.argumentExecutors) {
+            RequiredPermissions requiredPermissions = RequiredPermissions.of(argumentExecutor.meta(), lite.sender());
+
+            if (!requiredPermissions.isEmpty()) {
+                continue;
+            }
+
             List<AnnotatedParameter<SENDER, ?>> parameters = argumentExecutor.annotatedParameters();
 
             suggestionMerger.appendRoot(this.suggestionParameters(lite, 0, routeAbove, 0, parameters));
@@ -153,6 +148,28 @@ public SuggestionMerger findSuggestion(Invocation<SENDER> invocation, int route)
         return suggestionMerger;
     }
 
+    private boolean hasPermissionToAnyExecutor(LiteSender liteSender) {
+        if (this.executors().isEmpty()) {
+            return true;
+        }
+
+        for (ArgumentExecutor<SENDER> executor : this.argumentExecutors) {
+            Collection<String> permissions = executor.meta().getPermissions();
+
+            if (permissions.isEmpty()) {
+                return true;
+            }
+
+            for (String permission : permissions) {
+                if (liteSender.hasPermission(permission)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     private SuggestionStack suggestionParameters(LiteInvocation lite, int margin, int routeAbove, int parameterIndex, List<AnnotatedParameter<SENDER, ?>> parameters) {
         List<AnnotatedParameter<SENDER, ?>> list = parameters.subList(parameterIndex, parameters.size());
         int routeReal = routeAbove + parameterIndex;

litecommands-core/src/test/java/dev/rollczi/litecommands/suggestion/SuggestionWithPermissionTest.java

@@ -1,5 +1,6 @@
 package dev.rollczi.litecommands.suggestion;
 
+import dev.rollczi.litecommands.argument.Arg;
 import dev.rollczi.litecommands.command.permission.Permission;
 import dev.rollczi.litecommands.command.route.Route;
 import dev.rollczi.litecommands.test.TestFactory;
@@ -15,10 +16,16 @@ public class SuggestionWithPermissionTest {
     @Permission("permission.test")
     static class Command {
 
+        enum TestEnum { A, B }
+
         @Route(name = "a")
         @Permission("test.a")
         void a() {}
 
+        @Route(name = "a")
+        @Permission("test.a.withArg")
+        void a(@Arg TestEnum testEnum) {}
+
         @Route(name = "b")
         @Permission("test.b")
         void b() {}
@@ -45,5 +52,14 @@ void testWithPermission() {
             .assertWith("a", "b");
     }
 
+    @Test
+    void testWithExecutor() {
+        platform.suggest(TestPermissionSender.with("permission.test", "test.a.withArg"), "test", "a", "")
+            .assertWith("A", "B");
+
+        platform.suggest(TestPermissionSender.with("permission.test", "test.a"), "test", "a", "")
+            .assertWith();
+    }
+
 
 }

litecommands-core/src/test/java/dev/rollczi/litecommands/test/AssertSuggest.java

@@ -25,7 +25,7 @@ public void assertNonEmpty() {
     public void assertWith(String... suggestions) {
         List<String> suggestionSet = this.suggestions.multilevelSuggestions();
 
-        Assertions.assertEquals(suggestionSet.size(), suggestions.length);
+        Assertions.assertEquals(suggestions.length, suggestionSet.size());
 
         for (String suggestion : suggestions) {
             Assertions.assertTrue(suggestionSet.contains(suggestion), "Suggestion '" + suggestion + "' not found! " + String.join(", ", suggestionSet));