add more keywords for future, support 100_000 literals

Author: i582

editors/code/src/languages/syntaxes/tolk.tmLanguage.test.ts

@@ -15,6 +15,20 @@ interface TolkGrammar {
 }
 
 describe("Tolk TextMate grammar", () => {
+    it("scopes integer literals with separators", () => {
+        const grammar = readTolkGrammar()
+        const numericPattern = grammar.patterns.find(pattern => pattern.name === "constant.numeric")
+        const numericRegex = new RegExp(numericPattern?.match ?? "", "u")
+
+        expect(numericRegex.exec("100_000")?.[0]).toBe("100_000")
+        expect(numericRegex.exec("0xFF_FF")?.[0]).toBe("0xFF_FF")
+        expect(numericRegex.exec("0b1010_0011")?.[0]).toBe("0b1010_0011")
+
+        expect(numericRegex.exec("100_")).toBeNull()
+        expect(numericRegex.exec("0x_FF")).toBeNull()
+        expect(numericRegex.exec("0b_1010")).toBeNull()
+    })
+
     it("scopes dotted annotation names without scoping dots", () => {
         const grammar = readTolkGrammar()
         const annotationPattern = grammar.patterns.find(pattern => pattern.begin?.startsWith("(@)"))

syntaxes/tolk.tmLanguage.json

@@ -39,19 +39,19 @@
         },
         {
             "name": "constant.numeric",
-            "match": "\\b(-?([\\d]+|0x[\\da-fA-F]+|0b[01]+))\\b"
+            "match": "\\b(-?(0x[0-9a-fA-F](?:_?[0-9a-fA-F])*|0b[01](?:_?[01])*|[0-9](?:_?[0-9])*))\\b"
         },
         {
             "name": "keyword.control",
-            "match": "\\b(do|if|try|else|while|break|throw|catch|return|assert|repeat|continue|asm|builtin|match|lazy)\\b"
+            "match": "\\b(do|if|try|else|while|for|break|throw|catch|return|assert|repeat|continue|asm|builtin|match|lazy)\\b"
         },
         {
             "name": "keyword.operator",
             "match": "\\+|-|\\*|/|%|\\?|:|,|;|\\(|\\)|\\[|\\]|{|}|=|<|>|!|&|\\||\\^|==|!=|<=|>=|<<|>>|&&|\\|\\||~/|\\^/|\\+=|-=|\\*=|/=|%=|&=|\\|=|\\^=|->|<=>|~>>|\\^>>|<<=|>>=|=>|\\?\\?"
         },
         {
             "name": "keyword.other",
-            "match": "\\b(import|export|true|false|null|redef|mutate|tolk|as|is|!is|private|readonly|string|contract)\\b"
+            "match": "\\b(import|export|namespace|true|false|null|redef|mutate|tolk|as|is|!is|private|readonly|contract)\\b"
         },
         {
             "name": "keyword.other",