From 490bdfa3a4c45950b3d253ee1b33857ee6d070eb Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sun, 4 Jul 2021 20:57:56 -0700 Subject: [PATCH] Improve handling of non-quoted strings in quoted string parser --- .../commandframework/arguments/standard/StringArgument.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java index b5c7d1b4..b6b45f85 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java @@ -321,6 +321,12 @@ public final class StringArgument extends CommandArgument { final @NonNull CommandContext commandContext, final @NonNull Queue<@NonNull String> inputQueue ) { + final String peek = inputQueue.peek(); + if (peek != null && !peek.startsWith("'") && !peek.startsWith("\"")) { + inputQueue.remove(); + return ArgumentParseResult.success(peek); + } + final StringJoiner sj = new StringJoiner(" "); for (final String string : inputQueue) { sj.add(string);