@@ -2642,19 +2642,20 @@ private CharSequence appendDisplay(
26422642 new  Formatter (sb ).format (
26432643 indent  + "{\n "  +
26442644 indent  + " bool atLeastOne = false;\n "  +
2645-  indent  + " builder << R\" (\" %2 $s\" : [)\" ;\n "  +
2646-  indent  + " writer.%1 $s().forEach(\n "  +
2647-  indent  + " [&](auto &&%1 $s)\n "  +
2645+  indent  + " builder << R\" (\" %3 $s\" : [)\" ;\n "  +
2646+  indent  + " writer.%2 $s().forEach(\n "  +
2647+  indent  + " [&](%1$s &%2 $s)\n "  +
26482648 indent  + " {\n "  +
26492649 indent  + " if (atLeastOne)\n "  +
26502650 indent  + " {\n "  +
26512651 indent  + " builder << \" , \" ;\n "  +
26522652 indent  + " }\n "  +
26532653 indent  + " atLeastOne = true;\n "  +
2654-  indent  + " builder << %1 $s;\n "  +
2654+  indent  + " builder << %2 $s;\n "  +
26552655 indent  + " });\n "  +
26562656 indent  + " builder << ']';\n "  +
26572657 indent  + "}\n \n " ,
2658+  formatClassName (groupToken .name ()),
26582659 formatPropertyName (groupToken .name ()),
26592660 groupToken .name ());
26602661
@@ -3108,7 +3109,8 @@ private CharSequence generateMessageLength(final List<Token> groups, final List<
31083109 }
31093110
31103111 new  Formatter (sbSkip ).format (
3111-  indent  + " %1$s().forEach([](auto &&e){ e.skip(); });\n " ,
3112+  indent  + " %2$s().forEach([](%1$s &e){ e.skip(); });\n " ,
3113+  formatClassName (groupToken .name ()),
31123114 formatPropertyName (groupToken .name ()));
31133115
31143116 i  = endSignal ;
0 commit comments