Keep hacking at the aria.js grammar until it works

Author: Enrico Granata

_includes/head-custom.html

@@ -6,9 +6,8 @@
 
     hljs.registerLanguage("aria", aria);
 
-    // optional: built-in languages you use elsewhere
-    // import javascript from "https://esm.sh/highlight.js@11/es/languages/javascript";
-    // hljs.registerLanguage("javascript", javascript);
+    import bash from "https://esm.sh/highlight.js@11/es/languages/bash";
+    hljs.registerLanguage("bash", bash);
 
     document.addEventListener("DOMContentLoaded", () => {
         document.querySelectorAll("pre code").forEach(el => hljs.highlightElement(el));

assets/js/aria.js

@@ -39,7 +39,7 @@ export default function (hljs) {
             'and', 'case', 'isa', 'instance', 'reverse', 'try', 'catch', 'break', 'continue', 'for'
         ].join(' '),
         literal: 'true false',
-        built_in: 'println assert',
+        built_in: 'alloc arity exit getenv hasattr listattrs print println readattr readln setenv sleep system writeattr',
         type: 'Int Float String Bool Result Maybe Any'
     };
 
@@ -69,16 +69,17 @@ export default function (hljs) {
     const OP_SYM = /\+\-|u\-|\+|\-|\*|\/|%|<<|>>|==|<=|>=|<|>|\&|\||\^|\(\)|\[\]=|\[\]/;
     const OP_DEF = {
         className: 'function',
+        keywords: KEYWORDS,
         begin: new RegExp(`\\b(?:reverse\\s+)?operator\\s+(${OP_SYM.source})\\s*\\(`),
         beginScope: { 1: 'title.function' },
         end: /\)/,
         excludeEnd: true,
-        keywords: KEYWORDS,
         contains: [LINE_COMMENT]
     };
 
     const TYPE_LIKE_DEF = {
         className: 'class',
+        keywords: KEYWORDS,
         variants: [
             { begin: new RegExp(`\\bstruct\\s+(${IDENT.source})\\b`) },
             { begin: new RegExp(`\\benum\\s+(${IDENT.source})\\b`) },
@@ -88,14 +89,15 @@ export default function (hljs) {
     };
 
     const EXTENSION_DEF = {
-        begin: new RegExp(`\\bextension\\s+(${IDENT.source})\\b`),
-        beginScope: { 1: 'type' }
+        match: new RegExp(`\\b(extension)\\s+(${IDENT.source})\\b`),
+        scope: { 1: 'keyword', 2: 'type' },
+        relevance: 0
     };
 
     const ENUM_CASE_DECL = {
-        className: 'constant',
-        begin: new RegExp(`\\bcase\\s+(${IDENT.source})\\b`),
-        beginScope: { 1: 'constant' }
+        match: new RegExp(`\\b(case)\\s+(${IDENT.source})\\b`),
+        scope: { 1: 'keyword', 2: 'constant' },
+        relevance: 0
     };
 
     const ENUM_CASE_USE = {
@@ -138,21 +140,37 @@ export default function (hljs) {
     // Continuation lines: ::: ...
     const REPL_CONT = { className: 'meta', begin: /^:::\s?/m, relevance: 0 };
 
+    const BLOCK = {
+        begin: /\{/,
+        end: /\}/,
+        keywords: KEYWORDS,
+        contains: [
+            'self',
+            LINE_COMMENT,
+            DQ_STRING, SQ_STRING,
+            DEC_FLOAT, HEX_INT, OCT_INT, BIN_INT, DEC_INT,
+            LAMBDA_HEAD, TRY_PROTOCOL, ASSIGN_OP, INDEXING,
+            FUNC_DEF, METHOD_DEF, OP_DEF,
+            TYPE_LIKE_DEF, EXTENSION_DEF,
+            ENUM_CASE_DECL, ENUM_CASE_USE,
+            IMPORTS
+        ],
+        relevance: 0
+    };
+
     return {
         name: 'Aria',
         aliases: ['aria'],
         keywords: KEYWORDS,
         contains: [
-            SHEBANG,
-            REPL_PROMPT, REPL_CONT,
-            LINE_COMMENT,
-            DQ_STRING, SQ_STRING,
+            SHEBANG, REPL_PROMPT, REPL_CONT,
+            LINE_COMMENT, DQ_STRING, SQ_STRING,
             DEC_FLOAT, HEX_INT, OCT_INT, BIN_INT, DEC_INT,
             FUNC_DEF, METHOD_DEF, OP_DEF,
             TYPE_LIKE_DEF, EXTENSION_DEF,
             ENUM_CASE_DECL, ENUM_CASE_USE,
-            LAMBDA_HEAD, TRY_PROTOCOL, ASSIGN_OP,
-            INDEXING,
+            LAMBDA_HEAD, TRY_PROTOCOL, ASSIGN_OP, INDEXING,
+            BLOCK,
             IMPORTS
         ]
     };

manual.md

@@ -1006,7 +1006,7 @@ Square bracket access is defined by means of `operator [](index)` and `operator
 
 Defining `operator ()` allows objects to be called as if they are functions, e.g.
 
-```assert
+```aria
 struct CallMe {
     type func new() { return alloc(This); }
     operator ()(x,y,z) {