skip extra whitespace in flag autocompletion

Revxrsal · Sep 22, 2024 · 936d343 · 936d343
1 parent b3401a2
commit 936d343
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/common/src/main/java/revxrsal/commands/autocomplete/StandardAutoCompleter.java b/common/src/main/java/revxrsal/commands/autocomplete/StandardAutoCompleter.java
@@ -176,7 +176,7 @@ private List<String> complete(ExecutableCommand<A> possible, MutableStringStream
         List<ParameterNode<A, Object>> flags = filter(possible.parameters().values(), c -> c.isFlag() || c.isSwitch());
         while (input.hasRemaining()) {
             if (input.peek() == ' ')
-                input.moveForward();
+                input.skipWhitespace();
             String next = input.peekUnquotedString();
             if (next.startsWith(LONG_FORMAT_PREFIX)) {
                 String flagName = next.substring(LONG_FORMAT_PREFIX.length());
@@ -185,7 +185,7 @@ private List<String> complete(ExecutableCommand<A> possible, MutableStringStream
                 if (input.hasFinished())
                     return List.of();
                 if (input.hasRemaining() && input.peek() == ' ') {
-                    input.moveForward();
+                    input.skipWhitespace();
                 }
                 if (input.hasFinished() && parameter != null) {
                     return List.copyOf(parameter.suggestions().getSuggestions(context));
@@ -208,7 +208,7 @@ private List<String> complete(ExecutableCommand<A> possible, MutableStringStream
                         continue;
                     tryParseFlag(parameter, input, context);
                     if (input.hasRemaining() && input.peek() == ' ') {
-                        input.moveForward();
+                        input.skipWhitespace();
                         return List.copyOf(parameter.suggestions().getSuggestions(context));
                     } else if (input.hasFinished()) {
                         return flags.stream().map(f -> {
@@ -256,8 +256,7 @@ else if (child instanceof ParameterNode<A, ?> p)
             return List.of();
     }
 
-    private @Nullable ParameterNode<A, Object> removeParameterWithShorthand
-            (List<ParameterNode<A, Object>> parametersLeft, char c) {
+    private @Nullable ParameterNode<A, Object> removeParameterWithShorthand(List<ParameterNode<A, Object>> parametersLeft, char c) {
         for (Iterator<ParameterNode<A, Object>> iterator = parametersLeft.iterator(); iterator.hasNext(); ) {
             ParameterNode<A, Object> value = iterator.next();
             Character shorthand = value.shorthand();

diff --git a/common/src/main/java/revxrsal/commands/stream/MutableStringStream.java b/common/src/main/java/revxrsal/commands/stream/MutableStringStream.java
@@ -51,6 +51,11 @@ public interface MutableStringStream extends StringStream {
      */
     void moveForward();
 
+    /**
+     * Skips all the upcoming whitespace
+     */
+    void skipWhitespace();
+
     /**
      * Moves the cursor 1 step backward
      */

diff --git a/common/src/main/java/revxrsal/commands/stream/MutableStringStreamImpl.java b/common/src/main/java/revxrsal/commands/stream/MutableStringStreamImpl.java
@@ -69,6 +69,11 @@ public void moveForward() {
         moveForward(1);
     }
 
+    @Override public void skipWhitespace() {
+        while (hasRemaining() && peek() == ' ')
+            moveForward();
+    }
+
     public void moveBackward() {
         moveBackward(1);
     }