Improve highlighting of assembler index

Previously all of `,X` or `,Y` was highlighted as `keyword`. Now the `,` is highlighted as `symbol`.
mattgodbolt · Jan 29, 2025 · e00eded · e00eded
1 parent d57076b
commit e00eded
Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/bbcbasic.js b/src/bbcbasic.js
@@ -203,7 +203,7 @@ export function registerBbcBasicLanguage() {
                 ],
                 [/OPT|EQU[BDSW]/, "keyword.directive"],
                 [/\\[^:]*/, "comment"],
-                [/,\s*[XY]/, "keyword"],
+                [/,(?= *[XY]\b)/, {token: "symbol", switchTo: "@asmIndex"}],
                 ["#", "symbol"], // Immediate addressing
                 // labels
                 [/\.([a-zA-Z_][\w]*%?|@%)/, "type.identifier"],
@@ -212,6 +212,10 @@ export function registerBbcBasicLanguage() {
                 {include: "@common"},
                 ["]", {token: "delimiter.square", next: "@pop"}],
             ],
+            asmIndex: [
+                {include: "@whitespace"},
+                [/[XY]/, {token: "keyword", switchTo: "@asm"}],
+            ],
         },
     });
 

diff --git a/test/bbcbasic_test.js b/test/bbcbasic_test.js
@@ -183,10 +183,37 @@ describe("Tokenisation", () => {
             ],
         );
         checkTokens(
-            ["[LDA"],
+            ["[LDA(&70,X)"],
             [
                 {offset: 0, type: "delimiter.square"},
                 {offset: 1, type: "keyword"},
+                {offset: 4, type: "delimiter.parenthesis"},
+                {offset: 5, type: "number.hex"},
+                {offset: 8, type: "symbol"},
+                {offset: 9, type: "keyword"},
+                {offset: 10, type: "delimiter.parenthesis"},
+            ],
+        );
+        checkTokens(
+            ["[STA(&80),Y"],
+            [
+                {offset: 0, type: "delimiter.square"},
+                {offset: 1, type: "keyword"},
+                {offset: 4, type: "delimiter.parenthesis"},
+                {offset: 5, type: "number.hex"},
+                {offset: 8, type: "delimiter.parenthesis"},
+                {offset: 9, type: "symbol"},
+                {offset: 10, type: "keyword"},
+            ],
+        );
+        checkTokens(
+            ["[ORA@%,X"],
+            [
+                {offset: 0, type: "delimiter.square"},
+                {offset: 1, type: "keyword"},
+                {offset: 4, type: "variable"},
+                {offset: 6, type: "symbol"},
+                {offset: 7, type: "keyword"},
             ],
         );
         checkTokens(