skip extra whitespace in execution, respect quotes in greedy strings

Revxrsal · Sep 22, 2024 · 420d747 · 420d747
1 parent 891cb88
commit 420d747
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/common/src/main/java/revxrsal/commands/node/parser/Execution.java b/common/src/main/java/revxrsal/commands/node/parser/Execution.java
@@ -428,7 +428,7 @@ private boolean tryParse(
                 MutableExecutionContext<A> context
         ) {
             if (input.hasRemaining() && input.peek() == ' ')
-                input.moveForward();
+                input.skipWhitespace();
             int pos = input.position();
             if (node instanceof LiteralNodeImpl<A> l) {
                 String value = input.readUnquotedString();

diff --git a/common/src/main/java/revxrsal/commands/node/parser/FlagParser.java b/common/src/main/java/revxrsal/commands/node/parser/FlagParser.java
@@ -70,7 +70,7 @@ public boolean tryParse() {
             while (input.hasRemaining()) {
                 int start = input.position();
                 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());
@@ -113,7 +113,7 @@ private void parseNext(MutableExecutionContext<A> context, ParameterNode<A, Obje
         } else {
             if (input.hasFinished() || input.peek() != ' ')
                 throw new InputParseException(InputParseException.Cause.EXPECTED_WHITESPACE);
-            input.moveForward();
+            input.skipWhitespace();
             parseFlag(context, parameter, input);
         }
     }

diff --git a/...on/src/main/java/revxrsal/commands/parameter/builtins/CollectionParameterTypeFactory.java b/...on/src/main/java/revxrsal/commands/parameter/builtins/CollectionParameterTypeFactory.java
@@ -114,7 +114,7 @@ private List<Object> parseList(@NotNull MutableStringStream input, @NotNull Exec
                 elements.add(el);
                 if (input.hasRemaining()) {
                     if (input.peek() == delimiter)
-                        input.moveForward();
+                        input.skipWhitespace();
                     else
                         throw new InputParseException(InputParseException.Cause.EXPECTED_WHITESPACE);
                 }