feat: expose textmate worker

.eslintrc

@@ -23,9 +23,10 @@
         "mp3": "always",
         "json": "always",
         "contribution": "always", // Hack for vscode .contribution.js files
-        "protocol": "always", // Hack for vscode .protocol.js files,
-        "net": "always", // Hack for vscode .net.js files,
-        "impl": "always" // Hack for vscode .impl.js files
+        "protocol": "always", // Hack for vscode .protocol.js files
+        "net": "always", // Hack for vscode .net.js files
+        "impl": "always", // Hack for vscode .impl.js files
+        "worker": "always"
       }
     ]
   },

package.json

@@ -92,6 +92,10 @@
       "types": "./dist/service-override/quickaccess.d.ts",
       "default": "./dist/service-override/quickaccess.js"
     },
+    "./workers/textMate.worker": {
+      "types": "./dist/workers/textMate.worker.d.ts",
+      "default": "./dist/workers/textMate.worker.js"
+    },
     "./monaco": {
       "types": "./dist/monaco.d.ts",
       "default": "./dist/monaco.js"
@@ -164,6 +168,9 @@
       "service-override/quickaccess": [
         "./dist/service-override/quickaccess.d.ts"
       ],
+      "workers/textMate.worker": [
+        "./dist/workers/textMate.worker.d.ts"
+      ],
       "monaco": [
         "./dist/monaco.d.ts"
       ],

rollup/rollup.config.ts

@@ -354,7 +354,8 @@ const input = {
   'service-override/debug': './src/service-override/debug.ts',
   'service-override/preferences': './src/service-override/preferences.ts',
   'service-override/views': './src/service-override/views.ts',
-  'service-override/quickaccess': './src/service-override/quickaccess.ts'
+  'service-override/quickaccess': './src/service-override/quickaccess.ts',
+  'workers/textMate.worker': './src/workers/textMate.worker.ts',
   monaco: './src/monaco.ts',
   ...Object.fromEntries(
     fs.readdirSync(DEFAULT_EXTENSIONS_PATH, { withFileTypes: true })

rollup/rollup.types.config.ts

@@ -48,6 +48,7 @@ export default rollup.defineConfig({
     './dist/types/src/service-override/preferences.d.ts',
     './dist/types/src/service-override/views.d.ts',
     './dist/types/src/service-override/quickaccess.d.ts',
+    './dist/types/src/workers/textMate.worker.d.ts',
     './dist/types/src/monaco.d.ts',
     './dist/types/src/rollup-vsix-plugin.d.ts',
     './dist/types/src/rollup-extension-directory-plugin.d.ts'

scripts/vscode.patch

@@ -160,3 +160,19 @@ index 1111dabcbcd..08aa5052ee6 100644
  	}
 
  	isVisible(): boolean {
+diff --git a/src/vs/workbench/services/textMate/browser/worker/textMate.worker.ts b/src/vs/workbench/services/textMate/browser/worker/textMate.worker.ts
+index 67484e6ef40..636b27931eb 100644
+--- a/src/vs/workbench/services/textMate/browser/worker/textMate.worker.ts
++++ b/src/vs/workbench/services/textMate/browser/worker/textMate.worker.ts
+@@ -56,9 +56,8 @@ export class TextMateTokenizationWorker {
+ 	}
+
+ 	private async _loadTMGrammarFactory(grammarDefinitions: IValidGrammarDefinition[]): Promise<TMGrammarFactory> {
+-		const uri = this.createData.textmateMainUri;
+-		const vscodeTextmate = await import(uri);
+-		const vscodeOniguruma = await import(this.createData.onigurumaMainUri);
++		const vscodeTextmate = await import('vscode-textmate');
++		const vscodeOniguruma = await import('vscode-oniguruma');
+ 		const response = await fetch(this.createData.onigurumaWASMUri);
+
+ 		// Using the response directly only works if the server sets the MIME type 'application/wasm'.

src/service-override/textmate.ts

@@ -13,7 +13,8 @@ import getFileServiceOverride from './files'
 import { registerServiceInitializeParticipant } from '../services'
 import { registerAssets } from '../assets'
 registerAssets({
-  'vscode-oniguruma/../onig.wasm': _onigWasm
+  'vscode-oniguruma/../onig.wasm': _onigWasm, // Path used inside service
+  'vs/../../node_modules/vscode-oniguruma/release/onig.wasm': _onigWasm // Path used inside worker
 })
 
 registerServiceInitializeParticipant(async (accessor) => {

src/workers/textMate.worker.ts

@@ -0,0 +1,6 @@
+import { IWorkerContext } from 'vs/editor/common/services/editorSimpleWorker'
+import { ICreateData, TextMateTokenizationWorker } from 'vs/workbench/services/textMate/browser/worker/textMate.worker'
+import { TextMateWorkerHost } from 'vs/workbench/services/textMate/browser/workerHost/textMateWorkerHost'
+import { initialize } from 'vs/editor/editor.worker'
+
+initialize((ctx: IWorkerContext<TextMateWorkerHost>, createData: ICreateData) => new TextMateTokenizationWorker(ctx, createData))

tsconfig.types.json

@@ -75,6 +75,7 @@
 		"src/service-override/preferences.ts",
 		"src/service-override/views.ts",
 		"src/service-override/quickaccess.ts",
+		"src/workers/textMate.worker.ts",
 		"src/monaco.ts",
 		"src/rollup-vsix-plugin.ts",
 		"src/rollup-extension-directory-plugin.ts"