small fixes

Author: i582

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

@@ -4,6 +4,7 @@ import * as path from "node:path"
 interface GrammarPattern {
     readonly name?: string
     readonly match?: string
+    readonly captures?: Record<string, GrammarPattern>
     readonly begin?: string
     readonly beginCaptures?: Record<string, GrammarPattern>
     readonly end?: string
@@ -15,18 +16,57 @@ interface TolkGrammar {
 }
 
 describe("Tolk TextMate grammar", () => {
-    it("scopes integer literals with separators", () => {
+    it("scopes integer literals with compiler-compatible 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("123_")?.[0]).toBe("123_")
+        expect(numericRegex.exec("0b0_____1")?.[0]).toBe("0b0_____1")
+        expect(numericRegex.exec("0b_0____1")?.[0]).toBe("0b_0____1")
+        expect(numericRegex.exec("0x")?.[0]).toBe("0x")
+        expect(numericRegex.exec("0b")?.[0]).toBe("0b")
+        expect(numericRegex.exec("0x_FF")?.[0]).toBe("0x_FF")
+        expect(numericRegex.exec("0b_")?.[0]).toBe("0b_")
 
-        expect(numericRegex.exec("100_")).toBeNull()
-        expect(numericRegex.exec("0x_FF")).toBeNull()
-        expect(numericRegex.exec("0b_1010")).toBeNull()
+        expect(numericRegex.exec("_100")).toBeNull()
+    })
+
+    it("scopes only ordinary string escapes accepted by the compiler", () => {
+        const grammar = readTolkGrammar()
+        const stringPattern = grammar.patterns.find(
+            pattern => pattern.name === "string.quoted.double.tolk",
+        )
+        const escapePattern = stringPattern?.patterns?.find(
+            pattern => pattern.name === "constant.character.escape.tolk",
+        )
+        const escapeRegex = new RegExp(escapePattern?.match ?? "", "u")
+
+        for (const validEscape of ["\\n", "\\r", "\\t", "\\\\", "\\'", '\\"']) {
+            expect(escapeRegex.exec(validEscape)?.[0]).toBe(validEscape)
+        }
+
+        expect(escapeRegex.exec("\\0")).toBeNull()
+        expect(escapeRegex.exec("\\u")).toBeNull()
+        expect(escapeRegex.exec("\\u1234")).toBeNull()
+    })
+
+    it("keeps triple-quoted string escapes broad for asm strings", () => {
+        const grammar = readTolkGrammar()
+        const stringPattern = grammar.patterns.find(
+            pattern => pattern.name === "string.quoted.triple.tolk",
+        )
+        const escapePattern = stringPattern?.patterns?.find(
+            pattern => pattern.name === "constant.character.escape.tolk",
+        )
+        const escapeRegex = new RegExp(escapePattern?.match ?? "", "u")
+
+        for (const escape of ["\\n", "\\0", "\\u", "\\u1234", "\\x"]) {
+            expect(escapeRegex.exec(escape)?.[0]).toBe(escape.slice(0, 2))
+        }
     })
 
     it("scopes dotted annotation names without scoping dots", () => {

syntaxes/tolk.tmLanguage.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
-    "name": "tolk",
+    "name": "Tolk",
     "scopeName": "source.tolk",
     "foldingStartMarker": "\\{\\s*$",
     "foldingStopMarker": "^\\s*\\}",
@@ -33,13 +33,13 @@
             "patterns": [
                 {
                     "name": "constant.character.escape.tolk",
-                    "match": "\\\\([nrt0\\\\'\"u]|u[0-9a-fA-F]{4})"
+                    "match": "\\\\([nrt\\\\'\"])"
                 }
             ]
         },
         {
             "name": "constant.numeric",
-            "match": "\\b(-?(0x[0-9a-fA-F](?:_?[0-9a-fA-F])*|0b[01](?:_?[01])*|[0-9](?:_?[0-9])*))\\b"
+            "match": "\\b(-?(0x[0-9a-fA-F_]*|0b[01_]*|[0-9][0-9_]*))\\b"
         },
         {
             "name": "keyword.control",
@@ -51,7 +51,7 @@
         },
         {
             "name": "keyword.other",
-            "match": "\\b(import|export|namespace|true|false|null|redef|mutate|tolk|as|is|!is|private|readonly|contract)\\b"
+            "match": "\\b(import|export|namespace|true|false|null|mutate|tolk|as|is|private|readonly|contract)\\b"
         },
         {
             "name": "keyword.other",
@@ -100,7 +100,7 @@
         },
         {
             "name": "entity.name.function",
-            "match": "(`[^`]+`|[a-zA-Z$_][a-zA-Z0-9$_]*)(?=\\s*(?:<[^>]+>)?\\s*\\()"
+            "match": "(?<!\\.)(`[^`]+`|[a-zA-Z$_][a-zA-Z0-9$_]*)(?=\\s*(?:<[^()\\n]*>)?\\s*\\()"
         },
         {
             "name": "entity.name.type",