Allow newline as parameter separator character and within placeholders with whitespace

Author: Vampire

readme/README_template.md

@@ -282,10 +282,10 @@ There are two helpers to split the `parameterString` that is provided to `Comman
 that can then be handled separately.
 
 The first is the method `Command.getParameters(...)` which you give the parameter string and the maximum amount of
-parameters to split into. The provided string will then be split at any arbitrary amount of consecutive non-newline
-whitespace characters. The last element of the returned array will have all remaining text in the parameter string. If
-you expect exactly three parameters without whitespaces, you should set the max parameters to four, so you can easily
-test the length of the returned array whether too many parameters were given to the command.
+parameters to split into. The provided string will then be split at any arbitrary amount of consecutive whitespace
+characters. The last element of the returned array will have all remaining text in the parameter string. If you expect
+exactly three parameters without whitespaces, you should set the max parameters to four, so you can easily test the
+length of the returned array whether too many parameters were given to the command.
 
 The second is the [`ParameterParser`][ParameterParser JavaDoc] that you can get injected into your command. For the
 `ParameterParser` to work, the [usage](#command-usage) of the command has to follow a defined syntax language. This

src/main/java/net/kautler/command/api/Command.java

@@ -52,12 +52,12 @@
  */
 public interface Command<M> {
     /**
-     * The regex pattern string for one parameter separator character. It matches one whitespaces except newline.
+     * The regex pattern string for one parameter separator character. It matches one whitespace character.
      */
-    String PARAMETER_SEPARATOR_CHARACTER = "[\\s&&[^\\n]]";
+    String PARAMETER_SEPARATOR_CHARACTER = "\\s";
 
     /**
-     * The pattern that is used to split parameters. It matches an arbitrary amount of whitespaces except newlines.
+     * The pattern that is used to split parameters. It matches an arbitrary amount of whitespaces.
      */
     Pattern PARAMETER_SEPARATOR_PATTERN = Pattern.compile(PARAMETER_SEPARATOR_CHARACTER + "++");
 
@@ -272,7 +272,7 @@ default boolean isAsynchronous() {
 
     /**
      * Returns an array of parameters from the given parameter string. The parameter string is split at any sequence of
-     * non-newline whitespace characters. If you expect three parameters, you should set {@code maxParameters} to four,
+     * whitespace characters. If you expect three parameters, you should set {@code maxParameters} to four,
      * so you can easily test the length of the returned array whether too many parameters were given to the command.
      *
      * <p>For a syntactically and semantically parsing of the parameter string, you can have a look at the

src/main/java/net/kautler/command/api/CommandHandler.java

@@ -211,7 +211,7 @@ protected void doSetCommands(Instance<Command<? super M>> commands) {
                 commandByAlias.keySet().stream()
                         .map(Pattern::quote)
                         .collect(joining("|", "(?s)^(?<alias>", ")(?=\\s|$)"
-                                + "\\s?+" + PARAMETER_SEPARATOR_CHARACTER + "*+"
+                                + PARAMETER_SEPARATOR_CHARACTER + "*+"
                                 + "(?<parameterString>.*+)$")));
     }
 

src/main/java/net/kautler/command/usage/UsagePatternBuilder.java

@@ -179,7 +179,7 @@ public String visitPlaceholderWithWhitespace(PlaceholderWithWhitespaceContext ct
         String tokenText = ctx.getText();
         String tokenName = tokenText.substring(1, tokenText.length() - 4);
         return format(
-                "%s(?<%s>.+)$",
+                "%s(?<%s>(?s:.+))$",
                 PRECEDED_BY_PARAMETER_SEPARATOR_CHARACTER,
                 getGroupName(ctx, tokenName));
     }