Merge pull request #47136 from mkouba/issue-47132

Qute: section parameters are now separated by one or more whitespaces

Author: gsmet

docs/src/main/asciidoc/qute-reference.adoc

@@ -652,7 +652,7 @@ Some sections support optional end tags, i.e. if the end tag is missing then the
 ==== Parameters
 
 A start tag can define parameters with optional names, e.g. `{#if item.isActive}` and `{#let foo=1 bar=false}`.
-Parameters are separated by one or more spaces.
+Parameters are separated by one or more whitespaces.
 Names are separated from the values by the equals sign.
 Names and values can be prefixed and suffixed with any number of spaces, e.g. `{#let id='Foo'}` and `{#let id  = 'Foo'}` are equivalents where the name of the parameter is `id` and the value is `Foo`.
 Values can be grouped using parentheses, e.g. `{#let id=(item.id ?: 42)}` where the name is `id` and the value is `item.id ?: 42`.

independent-projects/qute/core/src/main/java/io/quarkus/qute/Parser.java

@@ -821,14 +821,14 @@ static <B extends ErrorInitializer & WithOrigin> Iterator<String> splitSectionPa
         boolean stringLiteralDouble = false;
         short composite = 0;
         byte brackets = 0;
-        boolean space = false;
+        boolean whitespace = false;
         List<String> parts = new ArrayList<>();
         StringBuilder buffer = new StringBuilder();
 
         for (int i = 0; i < content.length(); i++) {
             char c = content.charAt(i);
-            if (c == ' ') {
-                if (!space) {
+            if (Character.isWhitespace(c)) {
+                if (!whitespace) {
                     if (!stringLiteralSingle
                             && !stringLiteralDouble
                             && composite == 0
@@ -837,7 +837,7 @@ static <B extends ErrorInitializer & WithOrigin> Iterator<String> splitSectionPa
                             parts.add(buffer.toString());
                             buffer = new StringBuilder();
                         }
-                        space = true;
+                        whitespace = true;
                     } else {
                         buffer.append(c);
                     }
@@ -854,7 +854,7 @@ static <B extends ErrorInitializer & WithOrigin> Iterator<String> splitSectionPa
                 } else if (!stringLiteralSingle
                         && !stringLiteralDouble
                         && isCompositeStart(c)
-                        && (i == 0 || space || composite > 0
+                        && (i == 0 || whitespace || composite > 0
                                 || (buffer.length() > 0 && buffer.charAt(buffer.length() - 1) == '!'))) {
                     composite++;
                 } else if (!stringLiteralSingle
@@ -871,7 +871,7 @@ && isCompositeEnd(c)
                         && Parser.isRightBracket(c) && brackets > 0) {
                     brackets--;
                 }
-                space = false;
+                whitespace = false;
                 buffer.append(c);
             }
         }

independent-projects/qute/core/src/test/java/io/quarkus/qute/UserTagTest.java

@@ -243,4 +243,24 @@ public void testSkipIt() {
         assertEquals("foo=\"true\"",
                 engine.parse("{#arg foo=true 'foo and bar' /}").render());
     }
+
+    @Test
+    public void testArgumentsWhitespace() {
+        Engine engine = Engine.builder()
+                .addDefaults()
+                .addValueResolver(new ReflectionValueResolver())
+                .addSectionHelper(new UserTagSectionHelper.Factory("arg", "arg-tag"))
+                .addResultMapper(new HtmlEscaper(List.of("text/html")))
+                .build();
+        engine.putTemplate("arg-tag", engine.parse("{_args.asHtmlAttributes}::{hash}"));
+        assertEquals("class=\"rounded\" hash=\"ia3andy\"::ia3andy",
+                engine.parse("""
+                        {#arg hash='ia3andy'  \n\t
+                            class='rounded' /}
+                        """).render().trim());
+        assertEquals("class=\"rounded\" hash=\"ia3andy\"::ia3andy",
+                engine.parse("""
+                        {#arg hash='ia3andy'\n\tclass='rounded' /}
+                        """).render().trim());
+    }
 }