@nuraly/runtime 0.1.7 → 0.1.8

package/dist/{freemarker2-Bfqhwyij.js → freemarker2-D51H9HYi.js}

@@ -1,7 +1,7 @@
-import { m as f } from "./CodeEditor-YsOapSut.js";
+import { m as f } from "./CodeEditor-Bf4L2rO_.js";
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.45.0(5e5af013f8d295555a7210df0d5f2cea0bf5dd56)
+ * Version: 0.52.2(404545bded1df6ffa41ea0af4e8ddb219018c6c1)
  * Released under the MIT license
  * https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
  *-----------------------------------------------------------------------------*/
@@ -106,20 +106,26 @@ function l(t) {
     ],
     folding: {
       markers: {
-        start: new RegExp(`${t.open}#(?:${s.join("|")})([^/${t.close}]*(?!/)${t.close})[^${t.open}]*$`),
+        start: new RegExp(
+          `${t.open}#(?:${s.join("|")})([^/${t.close}]*(?!/)${t.close})[^${t.open}]*$`
+        ),
         end: new RegExp(`${t.open}/#(?:${s.join("|")})[\\r\\n\\t ]*>`)
       }
     },
     onEnterRules: [
       {
-        beforeText: new RegExp(`${t.open}#(?!(?:${d.join("|")}))([a-zA-Z_]+)([^/${t.close}]*(?!/)${t.close})[^${t.open}]*$`),
+        beforeText: new RegExp(
+          `${t.open}#(?!(?:${d.join("|")}))([a-zA-Z_]+)([^/${t.close}]*(?!/)${t.close})[^${t.open}]*$`
+        ),
         afterText: new RegExp(`^${t.open}/#([a-zA-Z_]+)[\\r\\n\\t ]*${t.close}$`),
         action: {
           indentAction: r.languages.IndentAction.IndentOutdent
         }
       },
       {
-        beforeText: new RegExp(`${t.open}#(?!(?:${d.join("|")}))([a-zA-Z_]+)([^/${t.close}]*(?!/)${t.close})[^${t.open}]*$`),
+        beforeText: new RegExp(
+          `${t.open}#(?!(?:${d.join("|")}))([a-zA-Z_]+)([^/${t.close}]*(?!/)${t.close})[^${t.open}]*$`
+        ),
         action: { indentAction: r.languages.IndentAction.Indent }
       }
     ]
@@ -127,6 +133,8 @@ function l(t) {
 }
 function g() {
   return {
+    // Cannot set block comment delimiter in auto mode...
+    // It depends on the content and the cursor position of the file...
     brackets: [
       ["<", ">"],
       ["[", "]"],
@@ -158,14 +166,18 @@ function g() {
     },
     onEnterRules: [
       {
-        beforeText: new RegExp(`[<\\[]#(?!(?:${d.join("|")}))([a-zA-Z_]+)([^/>\\]]*(?!/)[>\\]])[^[<\\[]]*$`),
+        beforeText: new RegExp(
+          `[<\\[]#(?!(?:${d.join("|")}))([a-zA-Z_]+)([^/>\\]]*(?!/)[>\\]])[^[<\\[]]*$`
+        ),
         afterText: new RegExp("^[<\\[]/#([a-zA-Z_]+)[\\r\\n\\t ]*[>\\]]$"),
         action: {
           indentAction: r.languages.IndentAction.IndentOutdent
         }
       },
       {
-        beforeText: new RegExp(`[<\\[]#(?!(?:${d.join("|")}))([a-zA-Z_]+)([^/>\\]]*(?!/)[>\\]])[^[<\\[]]*$`),
+        beforeText: new RegExp(
+          `[<\\[]#(?!(?:${d.join("|")}))([a-zA-Z_]+)([^/>\\]]*(?!/)[>\\]])[^[<\\[]]*$`
+        ),
         action: { indentAction: r.languages.IndentAction.Indent }
       }
     ]
@@ -177,6 +189,7 @@ function i(t, n) {
     return new RegExp(m, c.flags);
   };
   return {
+    // Settings
     unicode: !0,
     includeLF: !1,
     start: e("default__id__"),
@@ -189,50 +202,173 @@ function i(t, n) {
       { open: "(", close: ")", token: "delimiter.parenthesis" },
       { open: "<", close: ">", token: "delimiter.angle" }
     ],
+    // Dynamic RegExp
     [e("open__id__")]: new RegExp(t.open),
     [e("close__id__")]: new RegExp(t.close),
     [e("iOpen1__id__")]: new RegExp(n.open1),
     [e("iOpen2__id__")]: new RegExp(n.open2),
     [e("iClose__id__")]: new RegExp(n.close),
+    // <#START_TAG : "<" | "<#" | "[#">
+    // <#END_TAG : "</" | "</#" | "[/#">
     [e("startTag__id__")]: o(/(@open__id__)(#)/),
     [e("endTag__id__")]: o(/(@open__id__)(\/#)/),
     [e("startOrEndTag__id__")]: o(/(@open__id__)(\/?#)/),
+    // <#CLOSE_TAG1 : (<BLANK>)* (">" | "]")>
     [e("closeTag1__id__")]: o(/((?:@blank)*)(@close__id__)/),
+    // <#CLOSE_TAG2 : (<BLANK>)* ("/")? (">" | "]")>
     [e("closeTag2__id__")]: o(/((?:@blank)*\/?)(@close__id__)/),
+    // Static RegExp
+    // <#BLANK : " " | "\t" | "\n" | "\r">
     blank: /[ \t\n\r]/,
+    // <FALSE : "false">
+    // <TRUE : "true">
+    // <IN : "in">
+    // <AS : "as">
+    // <USING : "using">
     keywords: ["false", "true", "in", "as", "using"],
+    // Directive names that cannot have an expression parameters and cannot be self-closing
+    // E.g. <#if id==2> ... </#if>
     directiveStartCloseTag1: /attempt|recover|sep|auto[eE]sc|no(?:autoe|AutoE)sc|compress|default|no[eE]scape|comment|no[pP]arse/,
+    // Directive names that cannot have an expression parameter and can be self-closing
+    // E.g. <#if> ... <#else>  ... </#if>
+    // E.g. <#if> ... <#else /></#if>
     directiveStartCloseTag2: /else|break|continue|return|stop|flush|t|lt|rt|nt|nested|recurse|fallback|ftl/,
+    // Directive names that can have an expression parameter and cannot be self-closing
+    // E.g. <#if id==2> ... </#if>
     directiveStartBlank: /if|else[iI]f|list|for[eE]ach|switch|case|assign|global|local|include|import|function|macro|transform|visit|stop|return|call|setting|output[fF]ormat|nested|recurse|escape|ftl|items/,
+    // Directive names that can have an end tag
+    // E.g. </#if>
     directiveEndCloseTag1: /if|list|items|sep|recover|attempt|for[eE]ach|local|global|assign|function|macro|output[fF]ormat|auto[eE]sc|no(?:autoe|AutoE)sc|compress|transform|switch|escape|no[eE]scape/,
+    // <#ESCAPED_CHAR :
+    //     "\\"
+    //     (
+    //         ("n" | "t" | "r" | "f" | "b" | "g" | "l" | "a" | "\\" | "'" | "\"" | "{" | "=")
+    //         |
+    //         ("x" ["0"-"9", "A"-"F", "a"-"f"])
+    //     )
+    // >
+    // Note: While the JavaCC tokenizer rule only specifies one hex digit,
+    // FreeMarker actually interprets up to 4 hex digits.
     escapedChar: /\\(?:[ntrfbgla\\'"\{=]|(?:x[0-9A-Fa-f]{1,4}))/,
+    // <#ASCII_DIGIT: ["0" - "9"]>
     asciiDigit: /[0-9]/,
+    // <INTEGER : (["0"-"9"])+>
     integer: /[0-9]+/,
+    // <#NON_ESCAPED_ID_START_CHAR:
+    // [
+    // 	  // This was generated on JDK 1.8.0_20 Win64 with src/main/misc/identifierChars/IdentifierCharGenerator.java
+    //    ...
+    // ]
     nonEscapedIdStartChar: /[\$@-Z_a-z\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u1FFF\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183-\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3006\u3031-\u3035\u303B-\u303C\u3040-\u318F\u31A0-\u31BA\u31F0-\u31FF\u3300-\u337F\u3400-\u4DB5\u4E00-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8D0-\uA8D9\uA8F2-\uA8F7\uA8FB\uA900-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF-\uA9D9\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA50-\uAA59\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5-\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40-\uFB41\uFB43-\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/,
+    // <#ESCAPED_ID_CHAR: "\\" ("-" | "." | ":" | "#")>
     escapedIdChar: /\\[\-\.:#]/,
+    // <#ID_START_CHAR: <NON_ESCAPED_ID_START_CHAR>|<ESCAPED_ID_CHAR>>
     idStartChar: /(?:@nonEscapedIdStartChar)|(?:@escapedIdChar)/,
+    // <ID: <ID_START_CHAR> (<ID_START_CHAR>|<ASCII_DIGIT>)*>
     id: /(?:@idStartChar)(?:(?:@idStartChar)|(?:@asciiDigit))*/,
+    // Certain keywords / operators are allowed to index hashes
+    //
+    // Expression DotVariable(Expression exp) :
+    // {
+    // 	Token t;
+    // }
+    // {
+    // 		<DOT>
+    // 		(
+    // 			t = <ID> | t = <TIMES> | t = <DOUBLE_STAR>
+    // 			|
+    // 			(
+    // 				t = <LESS_THAN>
+    // 				|
+    // 				t = <LESS_THAN_EQUALS>
+    // 				|
+    // 				t = <ESCAPED_GT>
+    // 				|
+    // 				t = <ESCAPED_GTE>
+    // 				|
+    // 				t = <FALSE>
+    // 				|
+    // 				t = <TRUE>
+    // 				|
+    // 				t = <IN>
+    // 				|
+    // 				t = <AS>
+    // 				|
+    // 				t = <USING>
+    // 			)
+    // 			{
+    // 				if (!Character.isLetter(t.image.charAt(0))) {
+    // 					throw new ParseException(t.image + " is not a valid identifier.", template, t);
+    // 				}
+    // 			}
+    // 		)
+    // 		{
+    // 			notListLiteral(exp, "hash");
+    // 			notStringLiteral(exp, "hash");
+    // 			notBooleanLiteral(exp, "hash");
+    // 			Dot dot = new Dot(exp, t.image);
+    // 			dot.setLocation(template, exp, t);
+    // 			return dot;
+    // 		}
+    // }
     specialHashKeys: /\*\*|\*|false|true|in|as|using/,
+    // <DOUBLE_EQUALS : "==">
+    // <EQUALS : "=">
+    // <NOT_EQUALS : "!=">
+    // <PLUS_EQUALS : "+=">
+    // <MINUS_EQUALS : "-=">
+    // <TIMES_EQUALS : "*=">
+    // <DIV_EQUALS : "/=">
+    // <MOD_EQUALS : "%=">
+    // <PLUS_PLUS : "++">
+    // <MINUS_MINUS : "--">
+    // <LESS_THAN_EQUALS : "lte" | "\\lte" | "<=" | "&lt;=">
+    // <LESS_THAN : "lt" | "\\lt" | "<" | "&lt;">
+    // <ESCAPED_GTE : "gte" | "\\gte" | "&gt;=">
+    // <ESCAPED_GT: "gt" | "\\gt" |  "&gt;">
+    // <DOUBLE_STAR : "**">
+    // <PLUS : "+">
+    // <MINUS : "-">
+    // <TIMES : "*">
+    // <PERCENT : "%">
+    // <AND : "&" | "&&" | "&amp;&amp;" | "\\and" >
+    // <OR : "|" | "||">
+    // <EXCLAM : "!">
+    // <COMMA : ",">
+    // <SEMICOLON : ";">
+    // <COLON : ":">
+    // <ELLIPSIS : "...">
+    // <DOT_DOT_ASTERISK : "..*" >
+    // <DOT_DOT_LESS : "..<" | "..!" >
+    // <DOT_DOT : "..">
+    // <EXISTS : "??">
+    // <BUILT_IN : "?">
+    // <LAMBDA_ARROW : "->" | "-&gt;">
     namedSymbols: /&lt;=|&gt;=|\\lte|\\lt|&lt;|\\gte|\\gt|&gt;|&amp;&amp;|\\and|-&gt;|->|==|!=|\+=|-=|\*=|\/=|%=|\+\+|--|<=|&&|\|\||:|\.\.\.|\.\.\*|\.\.<|\.\.!|\?\?|=|<|\+|-|\*|\/|%|\||\.\.|\?|!|&|\.|,|;/,
     arrows: ["->", "-&gt;"],
     delimiters: [";", ":", ",", "."],
     stringOperators: ["lte", "lt", "gte", "gt"],
     noParseTags: ["noparse", "noParse", "comment"],
     tokenizer: {
+      // Parser states
+      // Plain text
       [e("default__id__")]: [
         { include: e("@directive_token__id__") },
         { include: e("@interpolation_and_text_token__id__") }
       ],
+      // A FreeMarker expression inside a directive, e.g. <#if 2<3>
       [e("fmExpression__id__.directive")]: [
         { include: e("@blank_and_expression_comment_token__id__") },
         { include: e("@directive_end_token__id__") },
         { include: e("@expression_token__id__") }
       ],
+      // A FreeMarker expression inside an interpolation, e.g. ${2+3}
       [e("fmExpression__id__.interpolation")]: [
         { include: e("@blank_and_expression_comment_token__id__") },
         { include: e("@expression_token__id__") },
         { include: e("@greater_operators_token__id__") }
       ],
+      // In an expression and inside a not-yet closed parenthesis / bracket
       [e("inParen__id__.plain")]: [
         { include: e("@blank_and_expression_comment_token__id__") },
         { include: e("@directive_end_token__id__") },
@@ -243,20 +379,57 @@ function i(t, n) {
         { include: e("@expression_token__id__") },
         { include: e("@greater_operators_token__id__") }
       ],
+      // Expression for the unified call, e.g. <@createMacro() ... >
       [e("noSpaceExpression__id__")]: [
         { include: e("@no_space_expression_end_token__id__") },
         { include: e("@directive_end_token__id__") },
         { include: e("@expression_token__id__") }
       ],
+      // For the function of a unified call. Special case for when the
+      // expression is a simple identifier.
+      // <@join [1,2] ",">
+      // <@null!join [1,2] ",">
       [e("unifiedCall__id__")]: [{ include: e("@unified_call_token__id__") }],
+      // For singly and doubly quoted string (that may contain interpolations)
       [e("singleString__id__")]: [{ include: e("@string_single_token__id__") }],
       [e("doubleString__id__")]: [{ include: e("@string_double_token__id__") }],
+      // For singly and doubly quoted string (that may not contain interpolations)
       [e("rawSingleString__id__")]: [{ include: e("@string_single_raw_token__id__") }],
       [e("rawDoubleString__id__")]: [{ include: e("@string_double_raw_token__id__") }],
+      // For a comment in an expression
+      // ${ 1 + <#-- comment --> 2}
       [e("expressionComment__id__")]: [{ include: e("@expression_comment_token__id__") }],
+      // For <#noparse> ... </#noparse>
+      // For <#noParse> ... </#noParse>
+      // For <#comment> ... </#comment>
       [e("noParse__id__")]: [{ include: e("@no_parse_token__id__") }],
+      // For <#-- ... -->
       [e("terseComment__id__")]: [{ include: e("@terse_comment_token__id__") }],
+      // Common rules
       [e("directive_token__id__")]: [
+        // <ATTEMPT : <START_TAG> "attempt" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <RECOVER : <START_TAG> "recover" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <SEP : <START_TAG> "sep" <CLOSE_TAG1>>
+        // <AUTOESC : <START_TAG> "auto" ("e"|"E") "sc" <CLOSE_TAG1>> {
+        //     handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 4), DEFAULT);
+        // }
+        // <NOAUTOESC : <START_TAG> "no" ("autoe"|"AutoE") "sc" <CLOSE_TAG1>> {
+        //     handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 2), DEFAULT);
+        // }
+        // <COMPRESS : <START_TAG> "compress" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <DEFAUL : <START_TAG> "default" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <NOESCAPE : <START_TAG> "no" ("e" | "E") "scape" <CLOSE_TAG1>> {
+        //     handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 2), DEFAULT);
+        // }
+        //
+        // <COMMENT : <START_TAG> "comment" <CLOSE_TAG1>> {
+        //     handleTagSyntaxAndSwitch(matchedToken, NO_PARSE); noparseTag = "comment";
+        // }
+        // <NOPARSE: <START_TAG> "no" ("p" | "P") "arse" <CLOSE_TAG1>> {
+        //     int tagNamingConvention = getTagNamingConvention(matchedToken, 2);
+        //     handleTagSyntaxAndSwitch(matchedToken, tagNamingConvention, NO_PARSE);
+        //     noparseTag = tagNamingConvention == Configuration.CAMEL_CASE_NAMING_CONVENTION ? "noParse" : "noparse";
+        // }
         [
           o(/(?:@startTag__id__)(@directiveStartCloseTag1)(?:@closeTag1__id__)/),
           t.id === "auto" ? {
@@ -277,6 +450,20 @@ function i(t, n) {
             { token: "@brackets.directive" }
           ]
         ],
+        // <ELSE : <START_TAG> "else" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <BREAK : <START_TAG> "break" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <CONTINUE : <START_TAG> "continue" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <SIMPLE_RETURN : <START_TAG> "return" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <HALT : <START_TAG> "stop" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <FLUSH : <START_TAG> "flush" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <TRIM : <START_TAG> "t" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <LTRIM : <START_TAG> "lt" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <RTRIM : <START_TAG> "rt" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <NOTRIM : <START_TAG> "nt" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <SIMPLE_NESTED : <START_TAG> "nested" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <SIMPLE_RECURSE : <START_TAG> "recurse" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <FALLBACK : <START_TAG> "fallback" <CLOSE_TAG2>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <TRIVIAL_FTL_HEADER : ("<#ftl" | "[#ftl") ("/")? (">" | "]")> { ftlHeader(matchedToken); }
         [
           o(/(?:@startTag__id__)(@directiveStartCloseTag2)(?:@closeTag2__id__)/),
           t.id === "auto" ? {
@@ -292,6 +479,45 @@ function i(t, n) {
             { token: "@brackets.directive" }
           ]
         ],
+        // <IF : <START_TAG> "if" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <ELSE_IF : <START_TAG> "else" ("i" | "I") "f" <BLANK>> {
+        // 	handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 4), FM_EXPRESSION);
+        // }
+        // <LIST : <START_TAG> "list" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <FOREACH : <START_TAG> "for" ("e" | "E") "ach" <BLANK>> {
+        //    handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 3), FM_EXPRESSION);
+        // }
+        // <SWITCH : <START_TAG> "switch" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <CASE : <START_TAG> "case" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <ASSIGN : <START_TAG> "assign" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <GLOBALASSIGN : <START_TAG> "global" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <LOCALASSIGN : <START_TAG> "local" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <_INCLUDE : <START_TAG> "include" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <IMPORT : <START_TAG> "import" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <FUNCTION : <START_TAG> "function" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <MACRO : <START_TAG> "macro" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <TRANSFORM : <START_TAG> "transform" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <VISIT : <START_TAG> "visit" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <STOP : <START_TAG> "stop" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <RETURN : <START_TAG> "return" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <CALL : <START_TAG> "call" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <SETTING : <START_TAG> "setting" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <OUTPUTFORMAT : <START_TAG> "output" ("f"|"F") "ormat" <BLANK>> {
+        //    handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 6), FM_EXPRESSION);
+        // }
+        // <NESTED : <START_TAG> "nested" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <RECURSE : <START_TAG> "recurse" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        // <ESCAPE : <START_TAG> "escape" <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
+        //
+        // Note: FreeMarker grammar appears to treat the FTL header as a special case,
+        // in order to remove new lines after the header (?), but since we only need
+        // to tokenize for highlighting, we can include this directive here.
+        // <FTL_HEADER : ("<#ftl" | "[#ftl") <BLANK>> { ftlHeader(matchedToken); }
+        //
+        // Note: FreeMarker grammar appears to treat the items directive as a special case for
+        // the AST parsing process, but since we only need to tokenize, we can include this
+        // directive here.
+        // <ITEMS : <START_TAG> "items" (<BLANK>)+ <AS> <BLANK>> { handleTagSyntaxAndSwitch(matchedToken, FM_EXPRESSION); }
         [
           o(/(?:@startTag__id__)(@directiveStartBlank)(@blank)/),
           t.id === "auto" ? {
@@ -306,6 +532,35 @@ function i(t, n) {
             { token: "", next: e("@fmExpression__id__.directive") }
           ]
         ],
+        // <END_IF : <END_TAG> "if" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_LIST : <END_TAG> "list" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_SEP : <END_TAG> "sep" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_RECOVER : <END_TAG> "recover" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_ATTEMPT : <END_TAG> "attempt" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_FOREACH : <END_TAG> "for" ("e" | "E") "ach" <CLOSE_TAG1>> {
+        //     handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 3), DEFAULT);
+        // }
+        // <END_LOCAL : <END_TAG> "local" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_GLOBAL : <END_TAG> "global" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_ASSIGN : <END_TAG> "assign" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_FUNCTION : <END_TAG> "function" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_MACRO : <END_TAG> "macro" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_OUTPUTFORMAT : <END_TAG> "output" ("f" | "F") "ormat" <CLOSE_TAG1>> {
+        //     handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 6), DEFAULT);
+        // }
+        // <END_AUTOESC : <END_TAG> "auto" ("e" | "E") "sc" <CLOSE_TAG1>> {
+        //     handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 4), DEFAULT);
+        // }
+        // <END_NOAUTOESC : <END_TAG> "no" ("autoe"|"AutoE") "sc" <CLOSE_TAG1>> {
+        //   handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 2), DEFAULT);
+        // }
+        // <END_COMPRESS : <END_TAG> "compress" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_TRANSFORM : <END_TAG> "transform" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_SWITCH : <END_TAG> "switch" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_ESCAPE : <END_TAG> "escape" <CLOSE_TAG1>> { handleTagSyntaxAndSwitch(matchedToken, DEFAULT); }
+        // <END_NOESCAPE : <END_TAG> "no" ("e" | "E") "scape" <CLOSE_TAG1>> {
+        //     handleTagSyntaxAndSwitch(matchedToken, getTagNamingConvention(matchedToken, 2), DEFAULT);
+        // }
         [
           o(/(?:@endTag__id__)(@directiveEndCloseTag1)(?:@closeTag1__id__)/),
           t.id === "auto" ? {
@@ -321,6 +576,7 @@ function i(t, n) {
             { token: "@brackets.directive" }
           ]
         ],
+        // <UNIFIED_CALL : "<@" | "[@" > { unifiedCall(matchedToken); }
         [
           o(/(@open__id__)(@)/),
           t.id === "auto" ? {
@@ -333,6 +589,7 @@ function i(t, n) {
             { token: "delimiter.directive", next: e("@unifiedCall__id__") }
           ]
         ],
+        // <UNIFIED_CALL_END : ("<" | "[") "/@" ((<ID>) ("."<ID>)*)? <CLOSE_TAG1>> { unifiedCallEnd(matchedToken); }
         [
           o(/(@open__id__)(\/@)((?:(?:@id)(?:\.(?:@id))*)?)(?:@closeTag1__id__)/),
           [
@@ -343,6 +600,7 @@ function i(t, n) {
             { token: "@brackets.directive" }
           ]
         ],
+        // <TERSE_COMMENT : ("<" | "[") "#--" > { noparseTag = "-->"; handleTagSyntaxAndSwitch(matchedToken, NO_PARSE); }
         [
           o(/(@open__id__)#--/),
           t.id === "auto" ? {
@@ -352,6 +610,7 @@ function i(t, n) {
             }
           } : { token: "comment", next: e("@terseComment__id__") }
         ],
+        // <UNKNOWN_DIRECTIVE : ("[#" | "[/#" | "<#" | "</#") (["a"-"z", "A"-"Z", "_"])+>
         [
           o(/(?:@startOrEndTag__id__)([a-zA-Z_]+)/),
           t.id === "auto" ? {
@@ -366,7 +625,10 @@ function i(t, n) {
           ]
         ]
       ],
+      // <DEFAULT, NO_DIRECTIVE> TOKEN :
       [e("interpolation_and_text_token__id__")]: [
+        // <DOLLAR_INTERPOLATION_OPENING : "${"> { startInterpolation(matchedToken); }
+        // <SQUARE_BRACKET_INTERPOLATION_OPENING : "[="> { startInterpolation(matchedToken); }
         [
           o(/(@iOpen1__id__)(@iOpen2__id__)/),
           [
@@ -377,8 +639,24 @@ function i(t, n) {
             }
           ]
         ],
+        // <STATIC_TEXT_FALSE_ALARM : "$" | "#" | "<" | "[" | "{"> // to handle a lone dollar sign or "<" or "# or <@ with whitespace after"
+        // <STATIC_TEXT_WS : ("\n" | "\r" | "\t" | " ")+>
+        // <STATIC_TEXT_NON_WS : (~["$", "<", "#", "[", "{", "\n", "\r", "\t", " "])+>
         [/[\$#<\[\{]|(?:@blank)+|[^\$<#\[\{\n\r\t ]+/, { token: "source" }]
       ],
+      // <STRING_LITERAL :
+      // 	(
+      // 		"\""
+      // 		((~["\"", "\\"]) | <ESCAPED_CHAR>)*
+      // 		"\""
+      // 	)
+      // 	|
+      // 	(
+      // 		"'"
+      // 		((~["'", "\\"]) | <ESCAPED_CHAR>)*
+      // 		"'"
+      // 	)
+      // >
       [e("string_single_token__id__")]: [
         [/[^'\\]/, { token: "string" }],
         [/@escapedChar/, { token: "string.escape" }],
@@ -389,6 +667,7 @@ function i(t, n) {
         [/@escapedChar/, { token: "string.escape" }],
         [/"/, { token: "string", next: "@pop" }]
       ],
+      // <RAW_STRING : "r" (("\"" (~["\""])* "\"") | ("'" (~["'"])* "'"))>
       [e("string_single_raw_token__id__")]: [
         [/[^']+/, { token: "string.raw" }],
         [/'/, { token: "string.raw", next: "@pop" }]
@@ -397,7 +676,9 @@ function i(t, n) {
         [/[^"]+/, { token: "string.raw" }],
         [/"/, { token: "string.raw", next: "@pop" }]
       ],
+      // <FM_EXPRESSION, IN_PAREN, NO_SPACE_EXPRESSION, NAMED_PARAMETER_EXPRESSION> TOKEN :
       [e("expression_token__id__")]: [
+        // Strings
         [
           /(r?)(['"])/,
           {
@@ -415,6 +696,9 @@ function i(t, n) {
             }
           }
         ],
+        // Numbers
+        // <INTEGER : (["0"-"9"])+>
+        // <DECIMAL : <INTEGER> "." <INTEGER>>
         [
           /(?:@integer)(?:\.(?:@integer))?/,
           {
@@ -424,10 +708,13 @@ function i(t, n) {
             }
           }
         ],
+        // Special hash keys that must not be treated as identifiers
+        // after a period, e.g. a.** is accessing the key "**" of a
         [
           /(\.)(@blank*)(@specialHashKeys)/,
           [{ token: "delimiter" }, { token: "" }, { token: "identifier" }]
         ],
+        // Symbols / operators
         [
           /(?:@namedSymbols)/,
           {
@@ -438,6 +725,7 @@ function i(t, n) {
             }
           }
         ],
+        // Identifiers
         [
           /@id/,
           {
@@ -448,6 +736,12 @@ function i(t, n) {
             }
           }
         ],
+        // <OPEN_BRACKET : "[">
+        // <CLOSE_BRACKET : "]">
+        // <OPEN_PAREN : "(">
+        // <CLOSE_PAREN : ")">
+        // <OPENING_CURLY_BRACKET : "{">
+        // <CLOSING_CURLY_BRACKET : "}">
         [
           /[\[\]\(\)\{\}]/,
           {
@@ -463,9 +757,13 @@ function i(t, n) {
                   ...n.id === "bracket" ? {
                     "$S2==interpolation": { token: "@brackets.interpolation", next: "@popall" }
                   } : {},
+                  // This cannot happen while in auto mode, since this applies only to an
+                  // fmExpression inside a directive. But once we encounter the start of a
+                  // directive, we can establish the tag syntax mode.
                   ...t.id === "bracket" ? {
                     "$S2==directive": { token: "@brackets.directive", next: "@popall" }
                   } : {},
+                  // Ignore mismatched paren
                   [e("$S1==inParen__id__")]: { token: "@brackets", next: "@pop" },
                   "@default": { token: "@brackets" }
                 }
@@ -488,6 +786,7 @@ function i(t, n) {
                   ...n.id === "bracket" ? {} : {
                     "$S2==interpolation": { token: "@brackets.interpolation", next: "@popall" }
                   },
+                  // Ignore mismatched paren
                   [e("$S1==inParen__id__")]: { token: "@brackets", next: "@pop" },
                   "@default": { token: "@brackets" }
                 }
@@ -495,30 +794,60 @@ function i(t, n) {
             }
           }
         ],
+        // <OPEN_MISPLACED_INTERPOLATION : "${" | "#{" | "[=">
         [/\$\{/, { token: "delimiter.invalid" }]
       ],
+      // <FM_EXPRESSION, IN_PAREN, NAMED_PARAMETER_EXPRESSION> SKIP :
       [e("blank_and_expression_comment_token__id__")]: [
+        // < ( " " | "\t" | "\n" | "\r" )+ >
         [/(?:@blank)+/, { token: "" }],
+        // < ("<" | "[") ("#" | "!") "--"> : EXPRESSION_COMMENT
         [/[<\[][#!]--/, { token: "comment", next: e("@expressionComment__id__") }]
       ],
+      // <FM_EXPRESSION, NO_SPACE_EXPRESSION, NAMED_PARAMETER_EXPRESSION> TOKEN :
       [e("directive_end_token__id__")]: [
+        // <DIRECTIVE_END : ">">
+        // {
+        //     if (inFTLHeader) {
+        //         eatNewline();
+        //         inFTLHeader = false;
+        //     }
+        //     if (squBracTagSyntax || postInterpolationLexState != -1 /* We are in an interpolation */) {
+        //         matchedToken.kind = NATURAL_GT;
+        //     } else {
+        //         SwitchTo(DEFAULT);
+        //     }
+        // }
+        // This cannot happen while in auto mode, since this applies only to an
+        // fmExpression inside a directive. But once we encounter the start of a
+        // directive, we can establish the tag syntax mode.
         [
           />/,
           t.id === "bracket" ? { token: "operators" } : { token: "@brackets.directive", next: "@popall" }
         ],
+        // <EMPTY_DIRECTIVE_END : "/>" | "/]">
+        // It is a syntax error to end a tag with the wrong close token
+        // Let's indicate that to the user by not closing the tag
         [
           o(/(\/)(@close__id__)/),
           [{ token: "delimiter.directive" }, { token: "@brackets.directive", next: "@popall" }]
         ]
       ],
+      // <IN_PAREN> TOKEN :
       [e("greater_operators_token__id__")]: [
+        // <NATURAL_GT : ">">
         [/>/, { token: "operators" }],
+        // <NATURAL_GTE : ">=">
         [/>=/, { token: "operators" }]
       ],
+      // <NO_SPACE_EXPRESSION> TOKEN :
       [e("no_space_expression_end_token__id__")]: [
+        // <TERMINATING_WHITESPACE :  (["\n", "\r", "\t", " "])+> : FM_EXPRESSION
         [/(?:@blank)+/, { token: "", switchTo: e("@fmExpression__id__.directive") }]
       ],
       [e("unified_call_token__id__")]: [
+        // Special case for a call where the expression is just an ID
+        // <UNIFIED_CALL> <ID> <BLANK>+
         [
           /(@id)((?:@blank)+)/,
           [{ token: "tag" }, { token: "", next: e("@fmExpression__id__.directive") }]
@@ -533,7 +862,16 @@ function i(t, n) {
         ],
         [/./, { token: "@rematch", next: e("@noSpaceExpression__id__") }]
       ],
+      // <NO_PARSE> TOKEN :
       [e("no_parse_token__id__")]: [
+        // <MAYBE_END :
+        // 	 ("<" | "[")
+        // 	 "/"
+        // 	 ("#")?
+        // 	 (["a"-"z", "A"-"Z"])+
+        // 	 ( " " | "\t" | "\n" | "\r" )*
+        // 	 (">" | "]")
+        // >
         [
           o(/(@open__id__)(\/#?)([a-zA-Z]+)((?:@blank)*)(@close__id__)/),
           {
@@ -562,6 +900,8 @@ function i(t, n) {
             }
           }
         ],
+        // <KEEP_GOING : (~["<", "[", "-"])+>
+        // <LONE_LESS_THAN_OR_DASH : ["<", "[", "-"]>
         [
           /[^<\[\-]+|[<\[\-]/,
           {
@@ -572,7 +912,9 @@ function i(t, n) {
           }
         ]
       ],
+      // <EXPRESSION_COMMENT> SKIP:
       [e("expression_comment_token__id__")]: [
+        // < "-->" | "--]">
         [
           /--[>\]]/,
           {
@@ -580,10 +922,17 @@ function i(t, n) {
             next: "@pop"
           }
         ],
+        // < (~["-", ">", "]"])+ >
+        // < ">">
+        // < "]">
+        // < "-">
         [/[^\->\]]+|[>\]\-]/, { token: "comment" }]
       ],
       [e("terse_comment_token__id__")]: [
+        //  <TERSE_COMMENT_END : "-->" | "--]">
         [o(/--(?:@close__id__)/), { token: "comment", next: "@popall" }],
+        // <KEEP_GOING : (~["<", "[", "-"])+>
+        // <LONE_LESS_THAN_OR_DASH : ["<", "[", "-"]>
         [/[^<\[\-]+|[<\[\-]/, { token: "comment" }]
       ]
     }
@@ -592,9 +941,12 @@ function i(t, n) {
 function A(t) {
   const n = i(a, t), _ = i(u, t), e = i(D, t);
   return {
+    // Angle and bracket syntax mode
+    // We switch to one of these once we have determined the mode
     ...n,
     ..._,
     ...e,
+    // Settings
     unicode: !0,
     includeLF: !1,
     start: `default_auto_${t.id}`,