Fix qualified commands

Author: vaperion

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "io.github.vaperion.blade"
-version = "1.0.33"
+version = "1.0.34"
 
 subprojects {
     apply(plugin = "io.freefair.lombok")

core/src/main/java/me/vaperion/blade/util/BladeHelper.java

@@ -160,14 +160,8 @@ static String removeCommandQualifier(@NotNull String input) {
             return input;
         }
 
-        if (firstSpace == -1) {
-            return (startsWithSlash ? "/" : "") +
-                input.substring(colonIndex + 1);
-        }
-
         return (startsWithSlash ? "/" : "") +
-            input.substring(colonIndex + 1) +
-            input.substring(firstSpace);
+            input.substring(colonIndex + 1);
     }
 
 }

core/src/test/java/me/vaperion/blade/BladeHelperTest.java

@@ -6,6 +6,27 @@
 
 public class BladeHelperTest {
 
+    @Test
+    public void commandQualifierRemovalKeepsArgumentsOnce() {
+        Assertions.assertEquals(
+            "/lorem ipsum dolor",
+            BladeHelper.removeCommandQualifier("/test:lorem ipsum dolor")
+        );
+
+        Assertions.assertEquals(
+            "lorem ipsum dolor",
+            BladeHelper.removeCommandQualifier("test:lorem ipsum dolor")
+        );
+    }
+
+    @Test
+    public void commandQualifierRemovalIgnoresArgumentColons() {
+        Assertions.assertEquals(
+            "/lorem ipsum foo:bar",
+            BladeHelper.removeCommandQualifier("/lorem ipsum foo:bar")
+        );
+    }
+
     @Test
     public void suggestionArgumentsPreserveTrailingEmptyArgument() {
         Assertions.assertArrayEquals(

core/src/test/java/me/vaperion/blade/OverloadTest.java

@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.Objects;
 
+import static me.vaperion.blade.util.BladeHelper.removeCommandQualifier;
+
 public class OverloadTest {
 
     @BeforeEach
@@ -206,6 +208,30 @@ public void suggestionsOnlyComeFromOverloadsMatchingTypedArguments() {
         );
     }
 
+    @Test
+    public void classLevelMultiWordLabelDoesNotConsumeSubcommandAsArgument() {
+        Blade blade = BladeTestPlatform.createInstance();
+        blade.register(OverloadedCommands.LoremCommands.class);
+
+        ErrorMessage error = execute(blade, "lorem ipsum dolor");
+
+        Assertions.assertNotNull(error);
+        Assertions.assertEquals(ErrorMessage.Type.SHOW_COMMAND_USAGE, error.type());
+        Assertions.assertTrue(OverloadedCommands.INVOCATIONS.isEmpty());
+    }
+
+    @Test
+    public void qualifiedClassLevelMultiWordLabelDoesNotConsumeSubcommandAsArgument() {
+        Blade blade = BladeTestPlatform.createInstance();
+        blade.register(OverloadedCommands.LoremCommands.class);
+
+        ErrorMessage error = execute(blade, removeCommandQualifier("test:lorem ipsum dolor"));
+
+        Assertions.assertNotNull(error);
+        Assertions.assertEquals(ErrorMessage.Type.SHOW_COMMAND_USAGE, error.type());
+        Assertions.assertTrue(OverloadedCommands.INVOCATIONS.isEmpty());
+    }
+
     @Test
     public void unregisteringOneOverloadKeepsTheOthers() throws Exception {
         Blade blade = BladeTestPlatform.createInstance();

core/src/testFixtures/java/me/vaperion/blade/test/commands/OverloadedCommands.java

@@ -80,6 +80,19 @@ public static void paintShapes(@Name("first") @NotNull Shape first,
         INVOCATIONS.add("shapes=" + first + "," + second);
     }
 
+    @Command("hello world")
+    public static void helloWorld(@Name("arg") @NotNull String arg) {
+        INVOCATIONS.add("helloWorld=" + arg);
+    }
+
+    @Command("lorem")
+    public static final class LoremCommands {
+        @Command("ipsum dolor")
+        public static void dolor(@Name("arg") @NotNull String arg) {
+            INVOCATIONS.add("dolor=" + arg);
+        }
+    }
+
     public enum Color {RED, GREEN}
 
     public enum Shape {CIRCLE, SQUARE}