upgrade oniguruma/textmate dependency

Author: WebFreak001

package-lock.json

@@ -1368,8 +1368,9 @@
 		"grammar": "js-yaml syntaxes/dml.yml > syntaxes/dml.json; js-yaml syntaxes/diet.yml > syntaxes/diet.json; js-yaml syntaxes/d.yml > syntaxes/d.json; js-yaml syntaxes/sdl.yml > syntaxes/sdl.json; mocha out/test/ci"
 	},
 	"dependencies": {
-		"@vscode/webview-ui-toolkit": "^0.9.0",
 		"@vscode/codicons": "^0.0.27",
+		"@vscode/webview-ui-toolkit": "^0.9.0",
+		"@xmldom/xmldom": "^0.8.3",
 		"adm-zip": "^0.5.9",
 		"async": "^3.2.2",
 		"axios": "^0.24.0",
@@ -1384,8 +1385,7 @@
 		"string-argv": "^0.3.1",
 		"vscode-languageclient": "^8.0.0-next.2",
 		"vscode-test-adapter-api": "^1.9.0",
-		"which": "^2.0.2",
-		"@xmldom/xmldom": "^0.8.3"
+		"which": "^2.0.2"
 	},
 	"devDependencies": {
 		"@types/expand-tilde": "^2.0.0",
@@ -1401,8 +1401,9 @@
 		"mocha": "^9.1.3",
 		"source-map-support": "^0.5.19",
 		"typescript": "^4.4.2",
+		"vscode-oniguruma": "^1.7.0",
 		"vscode-test": "^1.6.1",
-		"vscode-textmate": "^4.4.0"
+		"vscode-textmate": "^8.0.0"
 	},
 	"__metadata": {
 		"id": "bf217d41-312b-4d39-9536-82fd0d9c6f94",

package.json

@@ -1,26 +1,37 @@
 import * as assert from 'assert';
 import * as vscode from 'vscode';
 import * as fs from 'fs';
-import * as paths from 'path';
+import * as path from 'path';
 import * as vsctm from 'vscode-textmate';
+import * as oniguruma from 'vscode-oniguruma';
 import { suite, test } from 'mocha';
+import { IRawGrammar } from 'vscode-textmate/release/rawGrammar';
 
 /**
  * Resolves a package relative path (relative to root folder / package.json folder) to the actual path
- * @param path the package relative path to resolve to an actual path
+ * @param pathStr the package relative path to resolve to an actual path
  */
-function res(path: string): string {
-	return paths.join(__dirname, "../../../", path);
+function res(pathStr: string): string {
+	return path.join(__dirname, "../../../", pathStr);
 }
 
-function readFile(path: string): Promise<Buffer> {
+const wasmBin = fs.readFileSync(res('node_modules/vscode-oniguruma/release/onig.wasm')).buffer;
+const vscodeOnigurumaLib = oniguruma.loadWASM(wasmBin).then(() => {
+	return {
+		createOnigScanner: function(patterns: any) { return new oniguruma.OnigScanner(patterns); },
+		createOnigString: function(s: any) { return new oniguruma.OnigString(s); }
+	};
+});
+
+function readFile(pathStr: string): Promise<Buffer> {
 	return new Promise((resolve, reject) => {
-		fs.readFile(res(path), (error, data) => error ? reject(error) : resolve(data));
+		fs.readFile(res(pathStr), (error, data) => error ? reject(error) : resolve(data));
 	});
 }
 
 const registry = new vsctm.Registry({
-	loadGrammar: async (scopeName): Promise<vsctm.IRawGrammar | undefined | null> => {
+	onigLib: vscodeOnigurumaLib,
+	loadGrammar: async (scopeName): Promise<IRawGrammar | undefined | null> => {
 		if (scopeName === 'source.diet') {
 			const data = await readFile('syntaxes/diet.json');
 			return vsctm.parseRawGrammar(data.toString(), 'syntaxes/diet.json');
@@ -60,7 +71,7 @@ function testSyntaxes(grammar: vsctm.IGrammar, folder: string, ext: string) {
 
 					let ruleStack = vsctm.INITIAL;
 
-					const text = await readFile(paths.join(folder, file));
+					const text = await readFile(path.join(folder, file));
 					const lines = text.toString().split(/\r?\n/g);
 					const tokens = lines.map(line => grammar.tokenizeLine(line, ruleStack).tokens.map(a => {
 						return {
@@ -71,9 +82,9 @@ function testSyntaxes(grammar: vsctm.IGrammar, folder: string, ext: string) {
 					}));
 
 					const actual = tokens.map(line => JSON.stringify(line)).join("\n");
-					fs.writeFileSync(res(paths.join(folder, file) + ".actual"), actual);
+					fs.writeFileSync(res(path.join(folder, file) + ".actual"), actual);
 
-					const expectedText = await readFile(paths.join(folder, file) + ".expected");
+					const expectedText = await readFile(path.join(folder, file) + ".expected");
 					const expectedLines = expectedText.toString().split(/\r?\n/g);
 					const expectedTokens = expectedLines.map(line => JSON.parse(line));
 
@@ -113,4 +124,4 @@ suite("syntax tests", () => {
 			return testSyntaxes(grammar, "src/test/ci/syntax/dml", ".dml");
 		});
 	});
-});
+});