From e8f392df1e5711a8623a2e4d2c03ae28e86d0451 Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Tue, 21 Jan 2025 14:13:45 -0600 Subject: [PATCH] Reformatting --- src/bbcbasic.js | 27 +++++++++++++++++---------- test/bbcbasic_test.js | 7 +------ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/bbcbasic.js b/src/bbcbasic.js index fe10a82..51ee457 100644 --- a/src/bbcbasic.js +++ b/src/bbcbasic.js @@ -29,9 +29,12 @@ const allTokensForAsmRegex = keywords .map(escape) .join("|"); -const allByteTokensRegex = "[" + keywords - .map(kw => String.fromCodePoint(kw.token < 160 ? kw.token + 0x100 : kw.token)) - .join("") + "]"; +const allByteTokensRegex = + "[" + + keywords + .map(kw => String.fromCodePoint(kw.token < 160 ? kw.token + 0x100 : kw.token)) + .join("") + + "]"; function allAbbreviations(tokens) { const prefixes = new Set(); @@ -116,7 +119,11 @@ export function registerBbcBasicLanguage() { [/(\bREM|\xf4)$/, {token: "keyword"}], // A REM on its own line [/(\bREM|\xf4)/, {token: "keyword", next: "@remStatement"}], // A REM consumes to EOL [/(FN|PROC|\xa4|\xf2)/, {token: "keyword", next: "@fnProcName"}], - [/THEN|THE\.|TH\.|ELSE|ELS\.|EL\.|ERROR|ERRO\.|ERR\.|\u018c|\u018b|\u0185/, "keyword", "@pop"], // THEN, ELSE, ERROR end a statement + [ + /THEN|THE\.|TH\.|ELSE|ELS\.|EL\.|ERROR|ERRO\.|ERR\.|\u018c|\u018b|\u0185/, + "keyword", + "@pop", + ], // THEN, ELSE, ERROR end a statement // This is slower than using the "tokens" built in to monarch but // doesn't require whitespace delimited tokens. [allTokensRegex, "keyword"], @@ -271,12 +278,12 @@ export function registerBbcBasicLanguage() { const LowerCaseTokenRegex = new RegExp(`^(${allTokensRegex.toLowerCase()})(?![%$])`); const InvalidOperatorMap = new Map([ - ['==', '='], - ['!=', '<>'], - ['**', '^'], - ['><', '<>'], - ['=<', '<='], - ['=>', '>='], + ["==", "="], + ["!=", "<>"], + ["**", "^"], + ["><", "<>"], + ["=<", "<="], + ["=>", ">="], ]); export function getWarnings(lineNum, line, lineTokens) { diff --git a/test/bbcbasic_test.js b/test/bbcbasic_test.js index c44e4be..461290a 100644 --- a/test/bbcbasic_test.js +++ b/test/bbcbasic_test.js @@ -472,12 +472,7 @@ describe("Tokenisation", () => { }); it("should highlight invalid operators from other languages", () => { checkTokens( - [ - "INVALID=1==2OR8!=2**3", - "IFA><1ORB=<2ORB=>6GOTO10", - "A+=2", - "A=B<>E" - ], + ["INVALID=1==2OR8!=2**3", "IFA><1ORB=<2ORB=>6GOTO10", "A+=2", "A=B<>E"], [ {offset: 0, type: "variable"}, {offset: 7, type: "operator"},